[gedit] Remove dialog utility library

[Ignacio Casal Quinteiro <icq src gnome org>]

commit d63549723cab68413d3188aaaab60ee031993e79
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Wed Feb 22 14:25:40 2012 +0100

    Remove dialog utility library

 configure.ac                                       |    1 -
 gedit/Makefile.am                                  |   15 ++++++++-
 gedit/dialogs/Makefile.am                          |   31 --------------------
 .../gedit-close-confirmation-dialog.c              |    0
 .../gedit-close-confirmation-dialog.h              |    0
 gedit/gedit-commands-edit.c                        |    2 +-
 gedit/gedit-commands-file.c                        |    2 +-
 gedit/gedit-commands-search.c                      |    2 +-
 gedit/gedit-encodings-combo-box.c                  |    2 +-
 gedit/{dialogs => }/gedit-encodings-dialog.c       |    0
 gedit/{dialogs => }/gedit-encodings-dialog.h       |    0
 gedit/{dialogs => }/gedit-encodings-dialog.ui      |    0
 gedit/{dialogs => }/gedit-preferences-dialog.c     |    0
 gedit/{dialogs => }/gedit-preferences-dialog.h     |    0
 gedit/{dialogs => }/gedit-preferences-dialog.ui    |    0
 gedit/{dialogs => }/gedit-replace-dialog.c         |    0
 gedit/{dialogs => }/gedit-replace-dialog.h         |    0
 gedit/{dialogs => }/gedit-replace-dialog.ui        |    0
 gedit/gedit-session.c                              |    2 +-
 19 files changed, 18 insertions(+), 39 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 79304bb..cc90cdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -448,7 +448,6 @@ data/org.gnome.gedit.gschema.xml.in
 data/Makefile
 docs/Makefile
 docs/reference/Makefile
-gedit/dialogs/Makefile
 gedit/smclient/Makefile
 gedit/theatrics/Makefile
 gedit/Makefile
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index aac53fa..d67946e 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-SUBDIRS = dialogs smclient theatrics
+SUBDIRS = smclient theatrics
 
 bin_PROGRAMS = gedit
 
@@ -101,6 +101,7 @@ NOINST_H_FILES =			\
 	gedit-animated-overlay.h        \
 	gedit-cell-renderer-button.h	\
 	gedit-close-button.h		\
+	gedit-close-confirmation-dialog.h \
 	gedit-command-line.h		\
 	gedit-dbus.h			\
 	gedit-dirs.h			\
@@ -109,6 +110,7 @@ NOINST_H_FILES =			\
 	gedit-document-output-stream.h	\
 	gedit-document-saver.h		\
 	gedit-documents-panel.h		\
+	gedit-encodings-dialog.h	\
 	gedit-file-chooser-dialog.h	\
 	gedit-floating-slider.h		\
 	gedit-history-entry.h		\
@@ -118,8 +120,10 @@ NOINST_H_FILES =			\
 	gedit-notebook.h		\
 	gedit-notebook-popup-menu.h	\
 	gedit-plugins-engine.h		\
+	gedit-preferences-dialog.h	\
 	gedit-print-job.h		\
 	gedit-print-preview.h		\
+	gedit-replace-dialog.h		\
 	gedit-session.h			\
 	gedit-settings.h		\
 	gedit-status-combo-box.h	\
@@ -169,6 +173,7 @@ libgedit_c_files =			\
 	gedit-app.c               	\
 	gedit-cell-renderer-button.c	\
 	gedit-close-button.c		\
+	gedit-close-confirmation-dialog.c \
 	gedit-command-line.c		\
 	gedit-commands-documents.c	\
 	gedit-commands-edit.c		\
@@ -188,6 +193,7 @@ libgedit_c_files =			\
 	gedit-documents-panel.c		\
 	gedit-encodings.c		\
 	gedit-encodings-combo-box.c	\
+	gedit-encodings-dialog.c	\
 	gedit-file-chooser-dialog.c	\
 	gedit-floating-slider.c		\
 	gedit-history-entry.c		\
@@ -200,9 +206,11 @@ libgedit_c_files =			\
 	gedit-notebook-popup-menu.c	\
 	gedit-panel.c			\
 	gedit-plugins-engine.c		\
+	gedit-preferences-dialog.c	\
 	gedit-print-job.c		\
 	gedit-print-preview.c		\
 	gedit-progress-info-bar.c	\
+	gedit-replace-dialog.c		\
 	gedit-session.c			\
 	gedit-settings.c		\
 	gedit-statusbar.c		\
@@ -250,7 +258,10 @@ gedit-marshal.c: gedit-marshal.list $(GLIB_GENMARSHAL)
 uidir = $(datadir)/gedit/ui/
 ui_DATA = 				\
 	gedit-ui.xml			\
-	gedit-print-preferences.ui
+	gedit-print-preferences.ui	\
+	gedit-encodings-dialog.ui	\
+	gedit-preferences-dialog.ui	\
+	gedit-replace-dialog.ui
 
 if ENABLE_PYTHON
 overridesdir = $(pyoverridesdir)
diff --git a/gedit/dialogs/gedit-close-confirmation-dialog.c b/gedit/gedit-close-confirmation-dialog.c
similarity index 100%
rename from gedit/dialogs/gedit-close-confirmation-dialog.c
rename to gedit/gedit-close-confirmation-dialog.c
diff --git a/gedit/dialogs/gedit-close-confirmation-dialog.h b/gedit/gedit-close-confirmation-dialog.h
similarity index 100%
rename from gedit/dialogs/gedit-close-confirmation-dialog.h
rename to gedit/gedit-close-confirmation-dialog.h
diff --git a/gedit/gedit-commands-edit.c b/gedit/gedit-commands-edit.c
index b41e9d4..489484a 100644
--- a/gedit/gedit-commands-edit.c
+++ b/gedit/gedit-commands-edit.c
@@ -40,7 +40,7 @@
 #include "gedit-window.h"
 #include "gedit-debug.h"
 #include "gedit-view.h"
-#include "dialogs/gedit-preferences-dialog.h"
+#include "gedit-preferences-dialog.h"
 
 void
 _gedit_cmd_edit_undo (GtkAction   *action,
diff --git a/gedit/gedit-commands-file.c b/gedit/gedit-commands-file.c
index 711fa4e..c9812c0 100644
--- a/gedit/gedit-commands-file.c
+++ b/gedit/gedit-commands-file.c
@@ -47,7 +47,7 @@
 #include "gedit-debug.h"
 #include "gedit-utils.h"
 #include "gedit-file-chooser-dialog.h"
-#include "dialogs/gedit-close-confirmation-dialog.h"
+#include "gedit-close-confirmation-dialog.h"
 
 
 /* Defined constants */
diff --git a/gedit/gedit-commands-search.c b/gedit/gedit-commands-search.c
index 525108c..074af87 100644
--- a/gedit/gedit-commands-search.c
+++ b/gedit/gedit-commands-search.c
@@ -45,7 +45,7 @@
 #include "gedit-window.h"
 #include "gedit-window-private.h"
 #include "gedit-utils.h"
-#include "dialogs/gedit-replace-dialog.h"
+#include "gedit-replace-dialog.h"
 
 #define GEDIT_REPLACE_DIALOG_KEY	"gedit-replace-dialog-key"
 #define GEDIT_LAST_SEARCH_DATA_KEY	"gedit-last-search-data-key"
diff --git a/gedit/gedit-encodings-combo-box.c b/gedit/gedit-encodings-combo-box.c
index 6ca0a05..e5ce99d 100644
--- a/gedit/gedit-encodings-combo-box.c
+++ b/gedit/gedit-encodings-combo-box.c
@@ -37,7 +37,7 @@
 #include <gtk/gtk.h>
 
 #include <gedit/gedit-encodings-combo-box.h>
-#include <gedit/dialogs/gedit-encodings-dialog.h>
+#include <gedit/gedit-encodings-dialog.h>
 #include "gedit-settings.h"
 #include "gedit-utils.h"
 
diff --git a/gedit/dialogs/gedit-encodings-dialog.c b/gedit/gedit-encodings-dialog.c
similarity index 100%
rename from gedit/dialogs/gedit-encodings-dialog.c
rename to gedit/gedit-encodings-dialog.c
diff --git a/gedit/dialogs/gedit-encodings-dialog.h b/gedit/gedit-encodings-dialog.h
similarity index 100%
rename from gedit/dialogs/gedit-encodings-dialog.h
rename to gedit/gedit-encodings-dialog.h
diff --git a/gedit/dialogs/gedit-encodings-dialog.ui b/gedit/gedit-encodings-dialog.ui
similarity index 100%
rename from gedit/dialogs/gedit-encodings-dialog.ui
rename to gedit/gedit-encodings-dialog.ui
diff --git a/gedit/dialogs/gedit-preferences-dialog.c b/gedit/gedit-preferences-dialog.c
similarity index 100%
rename from gedit/dialogs/gedit-preferences-dialog.c
rename to gedit/gedit-preferences-dialog.c
diff --git a/gedit/dialogs/gedit-preferences-dialog.h b/gedit/gedit-preferences-dialog.h
similarity index 100%
rename from gedit/dialogs/gedit-preferences-dialog.h
rename to gedit/gedit-preferences-dialog.h
diff --git a/gedit/dialogs/gedit-preferences-dialog.ui b/gedit/gedit-preferences-dialog.ui
similarity index 100%
rename from gedit/dialogs/gedit-preferences-dialog.ui
rename to gedit/gedit-preferences-dialog.ui
diff --git a/gedit/dialogs/gedit-replace-dialog.c b/gedit/gedit-replace-dialog.c
similarity index 100%
rename from gedit/dialogs/gedit-replace-dialog.c
rename to gedit/gedit-replace-dialog.c
diff --git a/gedit/dialogs/gedit-replace-dialog.h b/gedit/gedit-replace-dialog.h
similarity index 100%
rename from gedit/dialogs/gedit-replace-dialog.h
rename to gedit/gedit-replace-dialog.h
diff --git a/gedit/dialogs/gedit-replace-dialog.ui b/gedit/gedit-replace-dialog.ui
similarity index 100%
rename from gedit/dialogs/gedit-replace-dialog.ui
rename to gedit/gedit-replace-dialog.ui
diff --git a/gedit/gedit-session.c b/gedit/gedit-session.c
index 328107b..823f852 100644
--- a/gedit/gedit-session.c
+++ b/gedit/gedit-session.c
@@ -50,7 +50,7 @@
 #include "gedit-window.h"
 #include "gedit-app.h"
 #include "gedit-commands.h"
-#include "dialogs/gedit-close-confirmation-dialog.h"
+#include "gedit-close-confirmation-dialog.h"
 #include "smclient/eggsmclient.h"
 
 /* The master client we use for SM */