[gedit/wip/reusable-code] Move gedit-utils to the libgedit

From: Sébastien Wilmet <swilmet src gnome org>
To: commits-list gnome org
Cc:
Subject: [gedit/wip/reusable-code] Move gedit-utils to the libgedit
Date: Fri, 13 Sep 2013 22:29:24 +0000 (UTC)
commit 24445b3f2b974a2460f3ab6bf68d420d526ef1db
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat Sep 14 00:19:06 2013 +0200

    Move gedit-utils to the libgedit

 gedit/Makefile.am                 |    5 +-
 gedit/gedit-app.c                 |    2 +-
 gedit/gedit-commands-file.c       |    2 +-
 gedit/gedit-commands-search.c     |    2 +-
 gedit/gedit-document-loader.c     |    2 +-
 gedit/gedit-document-saver.c      |    2 +-
 gedit/gedit-document.c            |    2 +-
 gedit/gedit-documents-panel.c     |    2 +-
 gedit/gedit-encodings-combo-box.c |    2 +-
 gedit/gedit-encodings-dialog.c    |    2 +-
 gedit/gedit-io-error-info-bar.c   |    2 +-
 gedit/gedit-plugins-engine.c      |    2 +-
 gedit/gedit-preferences-dialog.c  |    4 +-
 gedit/gedit-print-job.c           |    2 +-
 gedit/gedit-settings.c            |    2 +-
 gedit/gedit-tab.c                 |    2 +-
 gedit/gedit-utils.c               | 1433 -------------------------------------
 gedit/gedit-utils.h               |  151 ----
 gedit/gedit-view-frame.c          |    2 +-
 gedit/gedit-view.c                |    2 +-
 gedit/gedit-window.c              |    2 +-
 libgedit                          |    2 +-
 po/POTFILES.in                    |    2 +-
 23 files changed, 23 insertions(+), 1608 deletions(-)
---
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 5567ad7..3b2653d 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -141,13 +141,13 @@ INST_H_FILES =                            \
        gedit-progress-info-bar.h       \
        gedit-statusbar.h               \
        gedit-tab.h                     \
-       gedit-utils.h                   \
        gedit-view.h                    \
        gedit-view-activatable.h        \
        gedit-window.h                  \
        gedit-window-activatable.h      \
        $(top_srcdir)/libgedit/gedit/gedit-document-enums.h             \
-       $(top_srcdir)/libgedit/gedit/gedit-encodings.h
+       $(top_srcdir)/libgedit/gedit/gedit-encodings.h                  \
+       $(top_srcdir)/libgedit/gedit/gedit-utils.h
 
 if !ENABLE_GVFS_METADATA
 INST_H_FILES += $(top_srcdir)/libgedit/gedit/gedit-metadata-manager.h
@@ -211,7 +211,6 @@ libgedit_c_files =                  \
        gedit-status-menu-button.c      \
        gedit-tab.c                     \
        gedit-tab-label.c               \
-       gedit-utils.c                   \
        gedit-view.c                    \
        gedit-view-frame.c              \
        gedit-window.c
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index ae98d87..d780d78 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -49,7 +49,7 @@
 #include "gedit-commands.h"
 #include "gedit-notebook.h"
 #include "gedit-debug.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-enum-types.h"
 #include "gedit-dirs.h"
 #include "gedit-settings.h"
diff --git a/gedit/gedit-commands-file.c b/gedit/gedit-commands-file.c
index fdf4654..1771ac1 100644
--- a/gedit/gedit-commands-file.c
+++ b/gedit/gedit-commands-file.c
@@ -45,7 +45,7 @@
 #include "gedit-window-private.h"
 #include "gedit-statusbar.h"
 #include "gedit-debug.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-file-chooser-dialog.h"
 #include "gedit-close-confirmation-dialog.h"
 
diff --git a/gedit/gedit-commands-search.c b/gedit/gedit-commands-search.c
index 64fb417..b60ce9d 100644
--- a/gedit/gedit-commands-search.c
+++ b/gedit/gedit-commands-search.c
@@ -45,7 +45,7 @@
 #include "gedit-view-frame.h"
 #include "gedit-window.h"
 #include "gedit-window-private.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-replace-dialog.h"
 
 #define GEDIT_REPLACE_DIALOG_KEY       "gedit-replace-dialog-key"
diff --git a/gedit/gedit-document-loader.c b/gedit/gedit-document-loader.c
index 124eea5..7e04c4a 100644
--- a/gedit/gedit-document-loader.c
+++ b/gedit/gedit-document-loader.c
@@ -32,7 +32,7 @@
 
 #include "gedit-document-loader.h"
 #include "gedit-document-output-stream.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-marshal.h"
 #include "gedit-enum-types.h"
 #include "gedit-settings.h"
diff --git a/gedit/gedit-document-saver.c b/gedit/gedit-document-saver.c
index f21eb50..e30a2d1 100644
--- a/gedit/gedit-document-saver.c
+++ b/gedit/gedit-document-saver.c
@@ -30,7 +30,7 @@
 #include "gedit-document-saver.h"
 #include "gedit-document-input-stream.h"
 #include "gedit-marshal.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-enum-types.h"
 #include "gedit-settings.h"
 
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index 924b8e8..b1d8aa7 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -43,7 +43,7 @@
 #include "gedit-settings.h"
 #include "gedit-document.h"
 #include "gedit-debug.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-document-loader.h"
 #include "gedit-document-saver.h"
 #include "gedit-marshal.h"
diff --git a/gedit/gedit-documents-panel.c b/gedit/gedit-documents-panel.c
index 85c58f3..76c7e18 100644
--- a/gedit/gedit-documents-panel.c
+++ b/gedit/gedit-documents-panel.c
@@ -34,7 +34,7 @@
 
 #include "gedit-documents-panel.h"
 #include "gedit-debug.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-multi-notebook.h"
 #include "gedit-notebook.h"
 #include "gedit-notebook-popup-menu.h"
diff --git a/gedit/gedit-encodings-combo-box.c b/gedit/gedit-encodings-combo-box.c
index cfab000..6a597dd 100644
--- a/gedit/gedit-encodings-combo-box.c
+++ b/gedit/gedit-encodings-combo-box.c
@@ -39,7 +39,7 @@
 #include <gedit/gedit-encodings-combo-box.h>
 #include <gedit/gedit-encodings-dialog.h>
 #include "gedit-settings.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 
 #define ENCODING_KEY "Enconding"
 
diff --git a/gedit/gedit-encodings-dialog.c b/gedit/gedit-encodings-dialog.c
index d46c9f2..d3df180 100644
--- a/gedit/gedit-encodings-dialog.c
+++ b/gedit/gedit-encodings-dialog.c
@@ -40,7 +40,7 @@
 
 #include "gedit-encodings-dialog.h"
 #include "gedit/gedit-encodings.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-debug.h"
 #include "gedit-dirs.h"
 #include "gedit-settings.h"
diff --git a/gedit/gedit-io-error-info-bar.c b/gedit/gedit-io-error-info-bar.c
index 1763294..945d2df 100644
--- a/gedit/gedit-io-error-info-bar.c
+++ b/gedit/gedit-io-error-info-bar.c
@@ -43,7 +43,7 @@
 #include <gio/gio.h>
 
 #include "gedit-settings.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-document.h"
 #include "gedit-io-error-info-bar.h"
 #include <gedit/gedit-encodings-combo-box.h>
diff --git a/gedit/gedit-plugins-engine.c b/gedit/gedit-plugins-engine.c
index 6085af5..6f4d5c6 100644
--- a/gedit/gedit-plugins-engine.c
+++ b/gedit/gedit-plugins-engine.c
@@ -43,7 +43,7 @@
 #include "gedit-app.h"
 #include "gedit-dirs.h"
 #include "gedit-settings.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 
 struct _GeditPluginsEnginePrivate
 {
diff --git a/gedit/gedit-preferences-dialog.c b/gedit/gedit-preferences-dialog.c
index 4c10afd..fe0fa68 100644
--- a/gedit/gedit-preferences-dialog.c
+++ b/gedit/gedit-preferences-dialog.c
@@ -43,12 +43,12 @@
 #include <gtksourceview/gtksource.h>
 
 #include "gedit-preferences-dialog.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-debug.h"
 #include "gedit-document.h"
 #include "gedit-dirs.h"
 #include "gedit-settings.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 
 /*
  * gedit-preferences dialog is a singleton since we don't
diff --git a/gedit/gedit-print-job.c b/gedit/gedit-print-job.c
index 8c49bda..4ee0bd8 100644
--- a/gedit/gedit-print-job.c
+++ b/gedit/gedit-print-job.c
@@ -40,7 +40,7 @@
 #include "gedit-debug.h"
 #include "gedit-print-preview.h"
 #include "gedit-marshal.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-dirs.h"
 #include "gedit-settings.h"
 
diff --git a/gedit/gedit-settings.c b/gedit/gedit-settings.c
index 7191004..56f8ddf 100644
--- a/gedit/gedit-settings.c
+++ b/gedit/gedit-settings.c
@@ -36,7 +36,7 @@
 #include "gedit-window.h"
 #include "gedit-plugins-engine.h"
 #include "gedit-dirs.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-window-private.h"
 
 #define GEDIT_SETTINGS_LOCKDOWN_COMMAND_LINE "disable-command-line"
diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c
index 2dce78c..5ca5548 100644
--- a/gedit/gedit-tab.c
+++ b/gedit/gedit-tab.c
@@ -36,7 +36,7 @@
 #include "gedit-app.h"
 #include "gedit-notebook.h"
 #include "gedit-tab.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-io-error-info-bar.h"
 #include "gedit-print-job.h"
 #include "gedit-print-preview.h"
diff --git a/gedit/gedit-view-frame.c b/gedit/gedit-view-frame.c
index 0f6cf18..0480163 100644
--- a/gedit/gedit-view-frame.c
+++ b/gedit/gedit-view-frame.c
@@ -27,7 +27,7 @@
 
 #include "gedit-view-frame.h"
 #include "gedit-debug.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "libgd/gd.h"
 
 #include <gtksourceview/gtksource.h>
diff --git a/gedit/gedit-view.c b/gedit/gedit-view.c
index d191410..c850d2d 100644
--- a/gedit/gedit-view.c
+++ b/gedit/gedit-view.c
@@ -47,7 +47,7 @@
 #include "gedit-plugins-engine.h"
 #include "gedit-debug.h"
 #include "gedit-marshal.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-settings.h"
 #include "gedit-app.h"
 #include "gedit-notebook.h"
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index c8f5c40..ba592af 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -49,7 +49,7 @@
 #include "gedit-notebook-popup-menu.h"
 #include "gedit-multi-notebook.h"
 #include "gedit-statusbar.h"
-#include "gedit-utils.h"
+#include "gedit/gedit-utils.h"
 #include "gedit-commands.h"
 #include "gedit-debug.h"
 #include "gedit-open-tool-button.h"
diff --git a/libgedit b/libgedit
index 89f4c39..09ef492 160000
--- a/libgedit
+++ b/libgedit
@@ -1 +1 @@
-Subproject commit 89f4c39daf7059c78514b7b88ed5214cb9bc2af7
+Subproject commit 09ef4929af647731de455ab4419324dcd9b833a0
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 74fb53f..7f3e317 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -40,11 +40,11 @@ gedit/gedit-tab.c
 gedit/gedit-tab-label.c
 gedit/gedit-ui.h
 gedit/gedit-ui.xml
-gedit/gedit-utils.c
 gedit/gedit-view.c
 gedit/gedit-view-frame.c
 gedit/gedit-window.c
 libgedit/gedit/gedit-encodings.c
+libgedit/gedit/gedit-utils.c
 plugins/changecase/changecase.plugin.desktop.in
 plugins/changecase/gedit-changecase-plugin.c
 plugins/checkupdate/checkupdate.plugin.desktop.in
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]