Remove the dialog utility library

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

data/org.x.editor.service.in

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

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		\
@@ -42,11 +38,14 @@ BUILT_SOURCES = 			\
 
 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 						\
@@ -93,6 +92,7 @@ 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					\
@@ -105,6 +105,7 @@ libxed_c_files = 				\
 	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				\
@@ -114,6 +115,7 @@ libxed_c_files = 				\
 	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				\
@@ -158,7 +160,9 @@ uidir = $(datadir)/xed/ui/
 ui_DATA = 						\
 	xed-ui.xml					\
 	xed-searchbar.ui    		\
-	xed-print-preferences.ui
+	xed-print-preferences.ui 	\
+	xed-encodings-dialog.ui 	\
+	xed-preferences-dialog.ui
 
 EXTRA_DIST = 				\
 	$(ui_DATA)			\

xed/dialogs/Makefile.am

@@ -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

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,

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 */

xed/xed-encodings-combo-box.c

@@ -37,7 +37,7 @@
 #include <gtksourceview/gtksource.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-utils.h"