[gedit/wip/reusable-code] Move gedit-document-input-stream in the libgedit

[Sébastien Wilmet <swilmet src gnome org>]

commit 9bb6627decec9e1ec991eeb17d1f1923638b9abf
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat Sep 14 19:15:04 2013 +0200

    Move gedit-document-input-stream in the libgedit
    
    gedit-enum-types has been split in two: there is now the
    libgedit-enum-types too.

 gedit/Makefile.am                   |   19 +-
 gedit/gedit-document-input-stream.c |  504 -----------------------------------
 gedit/gedit-document-input-stream.h |   70 -----
 gedit/gedit-document-saver.c        |    2 +-
 gedit/gedit-enum-types.h.template   |    1 +
 libgedit                            |    2 +-
 tests/document-input-stream.c       |    3 +-
 7 files changed, 15 insertions(+), 586 deletions(-)
---
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 3b2653d..08dd2f5 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -102,7 +102,6 @@ NOINST_H_FILES =                    \
        gedit-close-button.h            \
        gedit-close-confirmation-dialog.h \
        gedit-dirs.h                    \
-       gedit-document-input-stream.h   \
        gedit-document-loader.h         \
        gedit-document-output-stream.h  \
        gedit-document-saver.h          \
@@ -144,19 +143,23 @@ INST_H_FILES =                            \
        gedit-view.h                    \
        gedit-view-activatable.h        \
        gedit-window.h                  \
-       gedit-window-activatable.h      \
+       gedit-window-activatable.h
+
+LIBGEDIT_INST_H_FILES =                                                        \
        $(top_srcdir)/libgedit/gedit/gedit-document-enums.h             \
        $(top_srcdir)/libgedit/gedit/gedit-encodings.h                  \
-       $(top_srcdir)/libgedit/gedit/gedit-utils.h
+       $(top_srcdir)/libgedit/gedit/gedit-utils.h                      \
+       $(top_srcdir)/libgedit/gedit/libgedit-enum-types.h
 
 if !ENABLE_GVFS_METADATA
-INST_H_FILES += $(top_srcdir)/libgedit/gedit/gedit-metadata-manager.h
+LIBGEDIT_INST_H_FILES += $(top_srcdir)/libgedit/gedit/gedit-metadata-manager.h
 endif
 
 headerdir = $(prefix)/include/gedit-$(GEDIT_API_VERSION)/gedit
 
 header_DATA =                          \
-       $(INST_H_FILES)
+       $(INST_H_FILES)                 \
+       $(LIBGEDIT_INST_H_FILES)
 
 BUILT_SOURCES_PRIVATE = \
        gedit-resources.c
@@ -182,7 +185,6 @@ libgedit_c_files =                  \
        gedit-debug.c                   \
        gedit-dirs.c                    \
        gedit-document.c                \
-       gedit-document-input-stream.c   \
        gedit-document-loader.c         \
        gedit-document-output-stream.c  \
        gedit-document-saver.c          \
@@ -222,7 +224,8 @@ libgedit_la_SOURCES =                       \
        $(BUILT_SOURCES)                \
        $(libgedit_c_files)             \
        $(NOINST_H_FILES)               \
-       $(INST_H_FILES)
+       $(INST_H_FILES)                 \
+       $(LIBGEDIT_INST_H_FILES)
 
 ENUM_TYPES =                   \
        gedit-notebook.h        \
@@ -280,7 +283,7 @@ INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir) -I$(top_srcdir)/libgedit --warn-all
 Gedit_3_0_gir_NAMESPACE = Gedit
 Gedit_3_0_gir_VERSION = 3.0
 Gedit_3_0_gir_PROGRAM = $(builddir)/gedit
-Gedit_3_0_gir_FILES = $(INST_H_FILES) $(libgedit_c_files) $(libgedit_submodule_c_files) $(BUILT_SOURCES)
+Gedit_3_0_gir_FILES = $(INST_H_FILES) $(LIBGEDIT_INST_H_FILES) $(libgedit_c_files) 
$(libgedit_submodule_c_files) $(BUILT_SOURCES)
 Gedit_3_0_gir_INCLUDES = Gtk-3.0 GtkSource-3.0
 
 girdir = $(datadir)/gedit/gir-1.0
diff --git a/gedit/gedit-document-saver.c b/gedit/gedit-document-saver.c
index e30a2d1..3653cd2 100644
--- a/gedit/gedit-document-saver.c
+++ b/gedit/gedit-document-saver.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "gedit-document-saver.h"
-#include "gedit-document-input-stream.h"
+#include "gedit/gedit-document-input-stream.h"
 #include "gedit-marshal.h"
 #include "gedit/gedit-utils.h"
 #include "gedit-enum-types.h"
diff --git a/gedit/gedit-enum-types.h.template b/gedit/gedit-enum-types.h.template
index 78f39ce..4dbfe42 100644
--- a/gedit/gedit-enum-types.h.template
+++ b/gedit/gedit-enum-types.h.template
@@ -3,6 +3,7 @@
 #define __GEDIT_ENUM_TYPES_H__
 
 #include <glib-object.h>
+#include <gedit/libgedit-enum-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgedit b/libgedit
index 09ef492..c01fb90 160000
--- a/libgedit
+++ b/libgedit
@@ -1 +1 @@
-Subproject commit 09ef4929af647731de455ab4419324dcd9b833a0
+Subproject commit c01fb908d418e246d2cd9071ce845db6f864071e
diff --git a/tests/document-input-stream.c b/tests/document-input-stream.c
index 5809977..9cdd5d7 100644
--- a/tests/document-input-stream.c
+++ b/tests/document-input-stream.c
@@ -20,8 +20,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-
-#include "gedit-document-input-stream.h"
+#include "gedit/gedit-document-input-stream.h"
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <glib.h>