[gedit/wip/reusable-code: 2/2] Move the metadata-manager to the libgedit

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

commit 4d782a1a933c5276d4ac8ccfb1d53b5f83be24b7
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Sep 12 22:15:21 2013 +0200

    Move the metadata-manager to the libgedit

 configure.ac                   |    9 +-
 gedit/Makefile.am              |    6 +-
 gedit/gedit-app.c              |    2 +-
 gedit/gedit-document-loader.c  |    2 +-
 gedit/gedit-document.c         |    2 +-
 gedit/gedit-metadata-manager.c |  602 ----------------------------------------
 gedit/gedit-metadata-manager.h |   46 ---
 libgedit                       |    2 +-
 8 files changed, 13 insertions(+), 658 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 76a956b..2cd095b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -362,7 +362,14 @@ dnl submodules
 dnl ================================================================
 
 LIBGD_INIT([tagged-entry static])
-LIBGEDIT_INIT([static])
+
+libgedit_options="static"
+
+if test "x$enable_gvfs_metadata" != "xno"; then
+       libgedit_options="$libgedit_options gvfs-metadata"
+fi
+
+LIBGEDIT_INIT([$libgedit_options])
 
 dnl ================================================================
 dnl GSettings stuff
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 839c105..f70dc24 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -149,7 +149,7 @@ INST_H_FILES =                              \
        $(top_srcdir)/libgedit/gedit/gedit-encodings.h
 
 if !ENABLE_GVFS_METADATA
-INST_H_FILES += gedit-metadata-manager.h
+INST_H_FILES += $(top_srcdir)/libgedit/gedit/gedit-metadata-manager.h
 endif
 
 headerdir = $(prefix)/include/gedit-$(GEDIT_API_VERSION)/gedit
@@ -224,10 +224,6 @@ libgedit_la_SOURCES =                      \
        $(NOINST_H_FILES)               \
        $(INST_H_FILES)
 
-if !ENABLE_GVFS_METADATA
-libgedit_la_SOURCES += gedit-metadata-manager.c
-endif
-
 ENUM_TYPES =                   \
        gedit-notebook.h        \
        $(INST_H_FILES)
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index 29553cf..ae98d87 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -59,7 +59,7 @@
 #include "gedit-preferences-dialog.h"
 
 #ifndef ENABLE_GVFS_METADATA
-#include "gedit-metadata-manager.h"
+#include "gedit/gedit-metadata-manager.h"
 #define METADATA_FILE "gedit-metadata.xml"
 #endif
 
diff --git a/gedit/gedit-document-loader.c b/gedit/gedit-document-loader.c
index 18d66ab..124eea5 100644
--- a/gedit/gedit-document-loader.c
+++ b/gedit/gedit-document-loader.c
@@ -38,7 +38,7 @@
 #include "gedit-settings.h"
 
 #ifndef ENABLE_GVFS_METADATA
-#include "gedit-metadata-manager.h"
+#include "gedit/gedit-metadata-manager.h"
 #endif
 
 #if 0
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index 5e136b7..924b8e8 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -50,7 +50,7 @@
 #include "gedit-enum-types.h"
 
 #ifndef ENABLE_GVFS_METADATA
-#include "gedit-metadata-manager.h"
+#include "gedit/gedit-metadata-manager.h"
 #else
 #define METADATA_QUERY "metadata::*"
 #endif
diff --git a/libgedit b/libgedit
index 27b4227..802aebe 160000
--- a/libgedit
+++ b/libgedit
@@ -1 +1 @@
-Subproject commit 27b422727387822804deb4fbf3353ff9904a3a01
+Subproject commit 802aebe46305c688216efd91598eb4e53c2d6ab4