From 3cfd0f3d5fd0218f6809a40facff8dcbf65625e8 Mon Sep 17 00:00:00 2001 From: JosephMcc Date: Mon, 6 Feb 2017 17:13:48 -0800 Subject: [PATCH] Remove the dialog utility library --- configure.ac | 1 - data/org.x.editor.service.in | 3 + xed/Makefile.am | 182 +++++++++--------- xed/dialogs/Makefile.am | 28 --- .../xed-close-confirmation-dialog.c | 0 .../xed-close-confirmation-dialog.h | 0 xed/xed-commands-edit.c | 2 +- xed/xed-commands-file.c | 2 +- xed/xed-encodings-combo-box.c | 2 +- xed/{dialogs => }/xed-encodings-dialog.c | 0 xed/{dialogs => }/xed-encodings-dialog.h | 0 xed/{dialogs => }/xed-encodings-dialog.ui | 0 xed/{dialogs => }/xed-preferences-dialog.c | 0 xed/{dialogs => }/xed-preferences-dialog.h | 0 xed/{dialogs => }/xed-preferences-dialog.ui | 0 15 files changed, 99 insertions(+), 121 deletions(-) create mode 100644 data/org.x.editor.service.in delete mode 100755 xed/dialogs/Makefile.am rename xed/{dialogs => }/xed-close-confirmation-dialog.c (100%) rename xed/{dialogs => }/xed-close-confirmation-dialog.h (100%) rename xed/{dialogs => }/xed-encodings-dialog.c (100%) rename xed/{dialogs => }/xed-encodings-dialog.h (100%) rename xed/{dialogs => }/xed-encodings-dialog.ui (100%) rename xed/{dialogs => }/xed-preferences-dialog.c (100%) rename xed/{dialogs => }/xed-preferences-dialog.h (100%) rename xed/{dialogs => }/xed-preferences-dialog.ui (100%) diff --git a/configure.ac b/configure.ac index f6591ee..dcacfec 100644 --- a/configure.ac +++ b/configure.ac @@ -223,7 +223,6 @@ data/org.x.editor.gschema.xml data/Makefile docs/Makefile docs/reference/Makefile -xed/dialogs/Makefile xed/Makefile help/Makefile pixmaps/Makefile diff --git a/data/org.x.editor.service.in b/data/org.x.editor.service.in new file mode 100644 index 0000000..53b59e5 --- /dev/null +++ b/data/org.x.editor.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.x.editor +Exec=@bindir@/xed \ No newline at end of file diff --git a/xed/Makefile.am b/xed/Makefile.am index d522ba6..4df6419 100644 --- a/xed/Makefile.am +++ b/xed/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = dialogs 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_LIBADD = \ - dialogs/libdialogs.la - # 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 = \ xed-enum-types.c \ @@ -40,43 +36,46 @@ BUILT_SOURCES = \ xed-marshal.h -NOINST_H_FILES = \ - xed-close-button.h \ - xed-dirs.h \ - xed-documents-panel.h \ - xed-history-entry.h \ - xed-io-error-info-bar.h \ - xed-plugins-engine.h \ - xed-print-job.h \ - xed-print-preview.h \ - xed-settings.h \ - xed-status-combo-box.h \ - xed-tab-label.h \ - xed-ui.h \ - xed-utils.h \ - xed-view-frame.h \ +NOINST_H_FILES = \ + xed-close-button.h \ + xed-close-confirmation-dialog.h \ + xed-dirs.h \ + xed-documents-panel.h \ + xed-encodings-dialog.h \ + xed-history-entry.h \ + xed-io-error-info-bar.h \ + xed-plugins-engine.h \ + xed-preferences-dialog.h \ + xed-print-job.h \ + xed-print-preview.h \ + xed-settings.h \ + xed-status-combo-box.h \ + xed-tab-label.h \ + xed-ui.h \ + xed-utils.h \ + xed-view-frame.h \ xed-window-private.h -INST_H_FILES = \ - xed-app.h \ - xed-app-activatable.h \ - xed-commands.h \ - xed-debug.h \ - xed-document.h \ - xed-encodings-combo-box.h \ - xed-file-chooser-dialog.h \ - xed-message-bus.h \ - xed-message-type.h \ - xed-message.h \ - xed-notebook.h \ - xed-panel.h \ - xed-progress-info-bar.h \ - xed-searchbar.h \ - xed-statusbar.h \ - xed-tab.h \ - xed-view.h \ - xed-view-activatable.h \ - xed-window.h \ +INST_H_FILES = \ + xed-app.h \ + xed-app-activatable.h \ + xed-commands.h \ + xed-debug.h \ + xed-document.h \ + xed-encodings-combo-box.h \ + xed-file-chooser-dialog.h \ + xed-message-bus.h \ + xed-message-type.h \ + xed-message.h \ + xed-notebook.h \ + xed-panel.h \ + xed-progress-info-bar.h \ + xed-searchbar.h \ + xed-statusbar.h \ + xed-tab.h \ + xed-view.h \ + xed-view-activatable.h \ + xed-window.h \ xed-window-activatable.h if !ENABLE_GVFS_METADATA @@ -85,56 +84,59 @@ endif headerdir = $(prefix)/include/xed -header_DATA = \ +header_DATA = \ $(INST_H_FILES) -libxed_c_files = \ - xed-app.c \ - xed-app-activatable.c \ - xed-close-button.c \ - xed-commands-documents.c \ - xed-commands-edit.c \ - xed-commands-file.c \ - xed-commands-file-print.c \ - xed-commands-help.c \ - xed-commands-search.c \ - xed-commands-view.c \ - xed-debug.c \ - xed-dirs.c \ - xed-document.c \ - xed-documents-panel.c \ - xed-encodings-combo-box.c \ - xed-file-chooser-dialog.c \ - xed-history-entry.c \ - xed-io-error-info-bar.c \ - xed-message-bus.c \ - xed-message-type.c \ - xed-message.c \ - xed-notebook.c \ - xed-panel.c \ - xed-plugins-engine.c \ - xed-print-job.c \ - xed-print-preview.c \ - xed-progress-info-bar.c \ - xed-settings.c \ - xed-searchbar.c \ - xed-statusbar.c \ - xed-status-combo-box.c \ - xed-tab.c \ - xed-tab-label.c \ - xed-utils.c \ - xed-view.c \ - xed-view-activatable.c \ - xed-view-frame.c \ - xed-window.c \ +libxed_c_files = \ + xed-app.c \ + xed-app-activatable.c \ + xed-close-button.c \ + xed-close-confirmation-dialog.c \ + xed-commands-documents.c \ + xed-commands-edit.c \ + xed-commands-file.c \ + xed-commands-file-print.c \ + xed-commands-help.c \ + xed-commands-search.c \ + xed-commands-view.c \ + xed-debug.c \ + xed-dirs.c \ + xed-document.c \ + xed-documents-panel.c \ + xed-encodings-combo-box.c \ + xed-encodings-dialog.c \ + xed-file-chooser-dialog.c \ + xed-history-entry.c \ + xed-io-error-info-bar.c \ + xed-message-bus.c \ + xed-message-type.c \ + xed-message.c \ + xed-notebook.c \ + xed-panel.c \ + xed-plugins-engine.c \ + xed-preferences-dialog.c \ + xed-print-job.c \ + xed-print-preview.c \ + xed-progress-info-bar.c \ + xed-settings.c \ + xed-searchbar.c \ + xed-statusbar.c \ + xed-status-combo-box.c \ + xed-tab.c \ + xed-tab-label.c \ + xed-utils.c \ + xed-view.c \ + xed-view-activatable.c \ + xed-view-frame.c \ + xed-window.c \ xed-window-activatable.c -libxed_la_SOURCES = \ - $(BUILT_SOURCES) \ - $(libxed_c_files) \ - $(POSIXIO_FILES) \ - $(NOINST_H_FILES) \ +libxed_la_SOURCES = \ + $(BUILT_SOURCES) \ + $(libxed_c_files) \ + $(POSIXIO_FILES) \ + $(NOINST_H_FILES) \ $(INST_H_FILES) if !ENABLE_GVFS_METADATA @@ -155,10 +157,12 @@ xed-marshal.c: xed-marshal.list $(GLIB_GENMARSHAL) $(GLIB_GENMARSHAL) $< --body --prefix=xed_marshal >> $@ uidir = $(datadir)/xed/ui/ -ui_DATA = \ - xed-ui.xml \ - xed-searchbar.ui \ - xed-print-preferences.ui +ui_DATA = \ + xed-ui.xml \ + xed-searchbar.ui \ + xed-print-preferences.ui \ + xed-encodings-dialog.ui \ + xed-preferences-dialog.ui EXTRA_DIST = \ $(ui_DATA) \ diff --git a/xed/dialogs/Makefile.am b/xed/dialogs/Makefile.am deleted file mode 100755 index 152e6ad..0000000 --- a/xed/dialogs/Makefile.am +++ /dev/null @@ -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 diff --git a/xed/dialogs/xed-close-confirmation-dialog.c b/xed/xed-close-confirmation-dialog.c similarity index 100% rename from xed/dialogs/xed-close-confirmation-dialog.c rename to xed/xed-close-confirmation-dialog.c diff --git a/xed/dialogs/xed-close-confirmation-dialog.h b/xed/xed-close-confirmation-dialog.h similarity index 100% rename from xed/dialogs/xed-close-confirmation-dialog.h rename to xed/xed-close-confirmation-dialog.h diff --git a/xed/xed-commands-edit.c b/xed/xed-commands-edit.c index 4762765..5509332 100644 --- a/xed/xed-commands-edit.c +++ b/xed/xed-commands-edit.c @@ -40,7 +40,7 @@ #include "xed-window.h" #include "xed-debug.h" #include "xed-view.h" -#include "dialogs/xed-preferences-dialog.h" +#include "xed-preferences-dialog.h" void _xed_cmd_edit_undo (GtkAction *action, diff --git a/xed/xed-commands-file.c b/xed/xed-commands-file.c index 9ec11de..7602efe 100644 --- a/xed/xed-commands-file.c +++ b/xed/xed-commands-file.c @@ -45,7 +45,7 @@ #include "xed-debug.h" #include "xed-utils.h" #include "xed-file-chooser-dialog.h" -#include "dialogs/xed-close-confirmation-dialog.h" +#include "xed-close-confirmation-dialog.h" /* Defined constants */ diff --git a/xed/xed-encodings-combo-box.c b/xed/xed-encodings-combo-box.c index b58ce34..257fc21 100644 --- a/xed/xed-encodings-combo-box.c +++ b/xed/xed-encodings-combo-box.c @@ -37,7 +37,7 @@ #include #include "xed/xed-encodings-combo-box.h" -#include +#include #include "xed-settings.h" #include "xed-utils.h" diff --git a/xed/dialogs/xed-encodings-dialog.c b/xed/xed-encodings-dialog.c similarity index 100% rename from xed/dialogs/xed-encodings-dialog.c rename to xed/xed-encodings-dialog.c diff --git a/xed/dialogs/xed-encodings-dialog.h b/xed/xed-encodings-dialog.h similarity index 100% rename from xed/dialogs/xed-encodings-dialog.h rename to xed/xed-encodings-dialog.h diff --git a/xed/dialogs/xed-encodings-dialog.ui b/xed/xed-encodings-dialog.ui similarity index 100% rename from xed/dialogs/xed-encodings-dialog.ui rename to xed/xed-encodings-dialog.ui diff --git a/xed/dialogs/xed-preferences-dialog.c b/xed/xed-preferences-dialog.c similarity index 100% rename from xed/dialogs/xed-preferences-dialog.c rename to xed/xed-preferences-dialog.c diff --git a/xed/dialogs/xed-preferences-dialog.h b/xed/xed-preferences-dialog.h similarity index 100% rename from xed/dialogs/xed-preferences-dialog.h rename to xed/xed-preferences-dialog.h diff --git a/xed/dialogs/xed-preferences-dialog.ui b/xed/xed-preferences-dialog.ui similarity index 100% rename from xed/dialogs/xed-preferences-dialog.ui rename to xed/xed-preferences-dialog.ui