wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Remove the dialog utility library

This commit is contained in:
JosephMcc 2017-02-06 17:13:48 -08:00
parent bf69e64718
commit 3cfd0f3d5f
15 changed files with 99 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -223,7 +223,6 @@ data/org.x.editor.gschema.xml
data/Makefile data/Makefile
docs/Makefile docs/Makefile
docs/reference/Makefile docs/reference/Makefile
xed/dialogs/Makefile
xed/Makefile xed/Makefile
help/Makefile help/Makefile
pixmaps/Makefile pixmaps/Makefile

3
data/org.x.editor.service.in Normal file
View File

@ -0,0 +1,3 @@
[D-BUS Service]
Name=org.x.editor
Exec=@bindir@/xed

182
xed/Makefile.am
View File

@ -1,5 +1,4 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
SUBDIRS = dialogs
bin_PROGRAMS = xed bin_PROGRAMS = xed
@ -27,11 +26,8 @@ xed_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
libxed_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" libxed_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
libxed_la_LIBADD = \
dialogs/libdialogs.la
# XED_LIBS must be the last to ensure correct order on some platforms # XED_LIBS must be the last to ensure correct order on some platforms
libxed_la_LIBADD += $(XED_LIBS) -lICE libxed_la_LIBADD = $(XED_LIBS)
BUILT_SOURCES = \ BUILT_SOURCES = \
xed-enum-types.c \ xed-enum-types.c \
@ -40,43 +36,46 @@ BUILT_SOURCES = \
xed-marshal.h xed-marshal.h
NOINST_H_FILES = \ NOINST_H_FILES = \
xed-close-button.h \ xed-close-button.h \
xed-dirs.h \ xed-close-confirmation-dialog.h \
xed-documents-panel.h \ xed-dirs.h \
xed-history-entry.h \ xed-documents-panel.h \
xed-io-error-info-bar.h \ xed-encodings-dialog.h \
xed-plugins-engine.h \ xed-history-entry.h \
xed-print-job.h \ xed-io-error-info-bar.h \
xed-print-preview.h \ xed-plugins-engine.h \
xed-settings.h \ xed-preferences-dialog.h \
xed-status-combo-box.h \ xed-print-job.h \
xed-tab-label.h \ xed-print-preview.h \
xed-ui.h \ xed-settings.h \
xed-utils.h \ xed-status-combo-box.h \
xed-view-frame.h \ xed-tab-label.h \
xed-ui.h \
xed-utils.h \
xed-view-frame.h \
xed-window-private.h xed-window-private.h
INST_H_FILES = \ INST_H_FILES = \
xed-app.h \ xed-app.h \
xed-app-activatable.h \ xed-app-activatable.h \
xed-commands.h \ xed-commands.h \
xed-debug.h \ xed-debug.h \
xed-document.h \ xed-document.h \
xed-encodings-combo-box.h \ xed-encodings-combo-box.h \
xed-file-chooser-dialog.h \ xed-file-chooser-dialog.h \
xed-message-bus.h \ xed-message-bus.h \
xed-message-type.h \ xed-message-type.h \
xed-message.h \ xed-message.h \
xed-notebook.h \ xed-notebook.h \
xed-panel.h \ xed-panel.h \
xed-progress-info-bar.h \ xed-progress-info-bar.h \
xed-searchbar.h \ xed-searchbar.h \
xed-statusbar.h \ xed-statusbar.h \
xed-tab.h \ xed-tab.h \
xed-view.h \ xed-view.h \
xed-view-activatable.h \ xed-view-activatable.h \
xed-window.h \ xed-window.h \
xed-window-activatable.h xed-window-activatable.h
if !ENABLE_GVFS_METADATA if !ENABLE_GVFS_METADATA
@ -85,56 +84,59 @@ endif
headerdir = $(prefix)/include/xed headerdir = $(prefix)/include/xed
header_DATA = \ header_DATA = \
$(INST_H_FILES) $(INST_H_FILES)
libxed_c_files = \ libxed_c_files = \
xed-app.c \ xed-app.c \
xed-app-activatable.c \ xed-app-activatable.c \
xed-close-button.c \ xed-close-button.c \
xed-commands-documents.c \ xed-close-confirmation-dialog.c \
xed-commands-edit.c \ xed-commands-documents.c \
xed-commands-file.c \ xed-commands-edit.c \
xed-commands-file-print.c \ xed-commands-file.c \
xed-commands-help.c \ xed-commands-file-print.c \
xed-commands-search.c \ xed-commands-help.c \
xed-commands-view.c \ xed-commands-search.c \
xed-debug.c \ xed-commands-view.c \
xed-dirs.c \ xed-debug.c \
xed-document.c \ xed-dirs.c \
xed-documents-panel.c \ xed-document.c \
xed-encodings-combo-box.c \ xed-documents-panel.c \
xed-file-chooser-dialog.c \ xed-encodings-combo-box.c \
xed-history-entry.c \ xed-encodings-dialog.c \
xed-io-error-info-bar.c \ xed-file-chooser-dialog.c \
xed-message-bus.c \ xed-history-entry.c \
xed-message-type.c \ xed-io-error-info-bar.c \
xed-message.c \ xed-message-bus.c \
xed-notebook.c \ xed-message-type.c \
xed-panel.c \ xed-message.c \
xed-plugins-engine.c \ xed-notebook.c \
xed-print-job.c \ xed-panel.c \
xed-print-preview.c \ xed-plugins-engine.c \
xed-progress-info-bar.c \ xed-preferences-dialog.c \
xed-settings.c \ xed-print-job.c \
xed-searchbar.c \ xed-print-preview.c \
xed-statusbar.c \ xed-progress-info-bar.c \
xed-status-combo-box.c \ xed-settings.c \
xed-tab.c \ xed-searchbar.c \
xed-tab-label.c \ xed-statusbar.c \
xed-utils.c \ xed-status-combo-box.c \
xed-view.c \ xed-tab.c \
xed-view-activatable.c \ xed-tab-label.c \
xed-view-frame.c \ xed-utils.c \
xed-window.c \ xed-view.c \
xed-view-activatable.c \
xed-view-frame.c \
xed-window.c \
xed-window-activatable.c xed-window-activatable.c
libxed_la_SOURCES = \ libxed_la_SOURCES = \
$(BUILT_SOURCES) \ $(BUILT_SOURCES) \
$(libxed_c_files) \ $(libxed_c_files) \
$(POSIXIO_FILES) \ $(POSIXIO_FILES) \
$(NOINST_H_FILES) \ $(NOINST_H_FILES) \
$(INST_H_FILES) $(INST_H_FILES)
if !ENABLE_GVFS_METADATA if !ENABLE_GVFS_METADATA
@ -155,10 +157,12 @@ xed-marshal.c: xed-marshal.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $< --body --prefix=xed_marshal >> $@ $(GLIB_GENMARSHAL) $< --body --prefix=xed_marshal >> $@
uidir = $(datadir)/xed/ui/ uidir = $(datadir)/xed/ui/
ui_DATA = \ ui_DATA = \
xed-ui.xml \ xed-ui.xml \
xed-searchbar.ui \ xed-searchbar.ui \
xed-print-preferences.ui xed-print-preferences.ui \
xed-encodings-dialog.ui \
xed-preferences-dialog.ui
EXTRA_DIST = \ EXTRA_DIST = \
$(ui_DATA) \ $(ui_DATA) \

28
xed/dialogs/Makefile.am
View File

@ -1,28 +0,0 @@
uidir = $(datadir)/xed/ui/
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/xed \
-I$(top_builddir)/xed \
$(XED_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS)
noinst_LTLIBRARIES = libdialogs.la
libdialogs_la_SOURCES = \
xed-preferences-dialog.h \
xed-preferences-dialog.c \
xed-close-confirmation-dialog.c \
xed-close-confirmation-dialog.h \
xed-encodings-dialog.c \
xed-encodings-dialog.h
ui_DATA = \
xed-encodings-dialog.ui \
xed-preferences-dialog.ui
EXTRA_DIST = $(ui_DATA)
-include $(top_srcdir)/git.mk

0
xed/dialogs/xed-close-confirmation-dialog.c → xed/xed-close-confirmation-dialog.c
View File

0
xed/dialogs/xed-close-confirmation-dialog.h → xed/xed-close-confirmation-dialog.h
View File

2
xed/xed-commands-edit.c
View File

@ -40,7 +40,7 @@
#include "xed-window.h" #include "xed-window.h"
#include "xed-debug.h" #include "xed-debug.h"
#include "xed-view.h" #include "xed-view.h"
#include "dialogs/xed-preferences-dialog.h" #include "xed-preferences-dialog.h"
void void
_xed_cmd_edit_undo (GtkAction *action, _xed_cmd_edit_undo (GtkAction *action,

2
xed/xed-commands-file.c
View File

@ -45,7 +45,7 @@
#include "xed-debug.h" #include "xed-debug.h"
#include "xed-utils.h" #include "xed-utils.h"
#include "xed-file-chooser-dialog.h" #include "xed-file-chooser-dialog.h"
#include "dialogs/xed-close-confirmation-dialog.h" #include "xed-close-confirmation-dialog.h"
/* Defined constants */ /* Defined constants */

2
xed/xed-encodings-combo-box.c
View File

@ -37,7 +37,7 @@
#include <gtksourceview/gtksource.h> #include <gtksourceview/gtksource.h>
#include "xed/xed-encodings-combo-box.h" #include "xed/xed-encodings-combo-box.h"
#include <xed/dialogs/xed-encodings-dialog.h> #include <xed/xed-encodings-dialog.h>
#include "xed-settings.h" #include "xed-settings.h"
#include "xed-utils.h" #include "xed-utils.h"

0
xed/dialogs/xed-encodings-dialog.c → xed/xed-encodings-dialog.c
View File

0
xed/dialogs/xed-encodings-dialog.h → xed/xed-encodings-dialog.h
View File

0
xed/dialogs/xed-encodings-dialog.ui → xed/xed-encodings-dialog.ui
View File

0
xed/dialogs/xed-preferences-dialog.c → xed/xed-preferences-dialog.c
View File

0
xed/dialogs/xed-preferences-dialog.h → xed/xed-preferences-dialog.h
View File

0
xed/dialogs/xed-preferences-dialog.ui → xed/xed-preferences-dialog.ui
View File