GNOME.org
 

[gedit/wip/reusable-code] Move gedit-marshal and gedit-document-saver to the libgedit

commit eb3c8121a8b74fd7e5c7e8e28c74b69ed762a5d7
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Sep 19 16:23:29 2013 +0200

    Move gedit-marshal and gedit-document-saver to the libgedit

 gedit/Makefile.am             |   14 +-
 gedit/gedit-document-loader.c |    2 +-
 gedit/gedit-document-saver.c  | 1150 -----------------------------------------
 gedit/gedit-document-saver.h  |  106 ----
 gedit/gedit-document.c        |    4 +-
 gedit/gedit-marshal.list      |   19 -
 gedit/gedit-message-bus.c     |    2 +-
 gedit/gedit-multi-notebook.c  |    2 +-
 gedit/gedit-notebook.c        |    2 +-
 gedit/gedit-print-job.c       |    2 +-
 gedit/gedit-view.c            |    2 +-
 gedit/gedit-window.c          |    2 +-
 libgedit                      |    2 +-
 po/POTFILES.in                |    2 +-
 14 files changed, 12 insertions(+), 1299 deletions(-)
---
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 793ab32..e422977 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -93,9 +93,7 @@ endif
 
 BUILT_SOURCES =                        \
        gedit-enum-types.c              \
-       gedit-enum-types.h              \
-       gedit-marshal.c                 \
-       gedit-marshal.h
+       gedit-enum-types.h
 
 NOINST_H_FILES =                       \
        gedit-cell-renderer-button.h    \
@@ -104,7 +102,6 @@ NOINST_H_FILES =                    \
        gedit-dirs.h                    \
        gedit-document-loader.h         \
        gedit-document-output-stream.h  \
-       gedit-document-saver.h          \
        gedit-documents-panel.h         \
        gedit-encodings-dialog.h        \
        gedit-file-chooser-dialog.h     \
@@ -187,7 +184,6 @@ libgedit_c_files =                  \
        gedit-document.c                \
        gedit-document-loader.c         \
        gedit-document-output-stream.c  \
-       gedit-document-saver.c          \
        gedit-documents-panel.c         \
        gedit-encodings-combo-box.c     \
        gedit-encodings-dialog.c        \
@@ -237,13 +233,6 @@ gedit-enum-types.h: gedit-enum-types.h.template $(ENUM_TYPES) $(GLIB_MKENUMS)
 gedit-enum-types.c: gedit-enum-types.c.template $(ENUM_TYPES) $(GLIB_MKENUMS)
        $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gedit-enum-types.c.template $(ENUM_TYPES)) > 
$@
 
-gedit-marshal.h: gedit-marshal.list $(GLIB_GENMARSHAL)
-       $(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=gedit_marshal > $@
-
-gedit-marshal.c: gedit-marshal.list $(GLIB_GENMARSHAL)
-       $(AM_V_GEN) echo "#include \"gedit-marshal.h\"" > $@ && \
-       $(GLIB_GENMARSHAL) $< --body --prefix=gedit_marshal >> $@
-
 gedit-resources.c: gedit.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/gedit.gresource.xml)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(srcdir)/gedit.gresource.xml
 
@@ -256,7 +245,6 @@ endif
 EXTRA_DIST =                           \
        gedit-enum-types.h.template     \
        gedit-enum-types.c.template     \
-       gedit-marshal.list              \
        gedit.rc                        \
        gedit.gresource.xml             \
        gedit-ui.xml                    \
diff --git a/gedit/gedit-document-loader.c b/gedit/gedit-document-loader.c
index 7e04c4a..84a326b 100644
--- a/gedit/gedit-document-loader.c
+++ b/gedit/gedit-document-loader.c
@@ -33,7 +33,7 @@
 #include "gedit-document-loader.h"
 #include "gedit-document-output-stream.h"
 #include "gedit/gedit-utils.h"
-#include "gedit-marshal.h"
+#include "gedit/gedit-marshal.h"
 #include "gedit-enum-types.h"
 #include "gedit-settings.h"
 
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index e8b3db9..8f03b8e 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -45,8 +45,8 @@
 #include "gedit-debug.h"
 #include "gedit/gedit-utils.h"
 #include "gedit-document-loader.h"
-#include "gedit-document-saver.h"
-#include "gedit-marshal.h"
+#include "gedit/gedit-document-saver.h"
+#include "gedit/gedit-marshal.h"
 #include "gedit-enum-types.h"
 
 #ifndef ENABLE_GVFS_METADATA
diff --git a/gedit/gedit-message-bus.c b/gedit/gedit-message-bus.c
index 52faa29..4365ab5 100644
--- a/gedit/gedit-message-bus.c
+++ b/gedit/gedit-message-bus.c
@@ -21,7 +21,7 @@
  */
 
 #include "gedit-message-bus.h"
-#include "gedit-marshal.h"
+#include "gedit/gedit-marshal.h"
 
 #include <string.h>
 #include <stdarg.h>
diff --git a/gedit/gedit-multi-notebook.c b/gedit/gedit-multi-notebook.c
index 3e36c70..b155c21 100644
--- a/gedit/gedit-multi-notebook.c
+++ b/gedit/gedit-multi-notebook.c
@@ -21,7 +21,7 @@
  */
 
 #include "gedit-multi-notebook.h"
-#include "gedit-marshal.h"
+#include "gedit/gedit-marshal.h"
 
 struct _GeditMultiNotebookPrivate
 {
diff --git a/gedit/gedit-notebook.c b/gedit/gedit-notebook.c
index 041babe..13746bd 100644
--- a/gedit/gedit-notebook.c
+++ b/gedit/gedit-notebook.c
@@ -49,7 +49,7 @@
 #include "gedit-window.h"
 #include "gedit-enum-types.h"
 #include "gedit-settings.h"
-#include "gedit-marshal.h"
+#include "gedit/gedit-marshal.h"
 
 #define GEDIT_NOTEBOOK_GROUP_NAME "GeditNotebookGroup"
 
diff --git a/gedit/gedit-print-job.c b/gedit/gedit-print-job.c
index 4ee0bd8..bdb3acf 100644
--- a/gedit/gedit-print-job.c
+++ b/gedit/gedit-print-job.c
@@ -39,7 +39,7 @@
 #include "gedit-print-job.h"
 #include "gedit-debug.h"
 #include "gedit-print-preview.h"
-#include "gedit-marshal.h"
+#include "gedit/gedit-marshal.h"
 #include "gedit/gedit-utils.h"
 #include "gedit-dirs.h"
 #include "gedit-settings.h"
diff --git a/gedit/gedit-view.c b/gedit/gedit-view.c
index c850d2d..1159e22 100644
--- a/gedit/gedit-view.c
+++ b/gedit/gedit-view.c
@@ -46,7 +46,7 @@
 #include "gedit-view-activatable.h"
 #include "gedit-plugins-engine.h"
 #include "gedit-debug.h"
-#include "gedit-marshal.h"
+#include "gedit/gedit-marshal.h"
 #include "gedit/gedit-utils.h"
 #include "gedit-settings.h"
 #include "gedit-app.h"
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index ba592af..80f3dd8 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -61,7 +61,7 @@
 #include "gedit-dirs.h"
 #include "gedit-status-menu-button.h"
 #include "gedit-settings.h"
-#include "gedit-marshal.h"
+#include "gedit/gedit-marshal.h"
 #include "gedit-document.h"
 
 #define LANGUAGE_NONE (const gchar *)"LangNone"
diff --git a/libgedit b/libgedit
index 86ba439..d49ed01 160000
--- a/libgedit
+++ b/libgedit
@@ -1 +1 @@
-Subproject commit 86ba4399f48a48657bd0b02bd63b517a8860e16d
+Subproject commit d49ed01341e1782b4cd1aeaa82a800d5e4c7e55c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7f3e317..ac8ff84 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,7 +12,6 @@ gedit/gedit-commands-help.c
 gedit/gedit-commands-search.c
 gedit/gedit-debug.c
 gedit/gedit-document.c
-gedit/gedit-document-saver.c
 gedit/gedit-documents-panel.c
 gedit/gedit-encodings-combo-box.c
 gedit/gedit-encodings-dialog.c
@@ -43,6 +42,7 @@ gedit/gedit-ui.xml
 gedit/gedit-view.c
 gedit/gedit-view-frame.c
 gedit/gedit-window.c
+libgedit/gedit/gedit-document-saver.c
 libgedit/gedit/gedit-encodings.c
 libgedit/gedit/gedit-utils.c
 plugins/changecase/changecase.plugin.desktop.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]