[gedit] Better name for conditional metadata flag and use it in all the files

[Paolo Borelli <pborelli src gnome org>]

commit 9011f03572e24a3371fbce392128b7c472502908
Author: Paolo Borelli <pborelli gnome org>
Date:   Sun Apr 18 15:16:29 2010 +0200

    Better name for conditional metadata flag and use it in all the files

 configure.ac                      |   23 ++++++++++++++---------
 gedit/Makefile.am                 |    4 ++--
 gedit/gedit-document.c            |    6 +++---
 gedit/gedit-gio-document-loader.c |    6 +++++-
 gedit/gedit.c                     |    7 +++++--
 5 files changed, 29 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3f604ac..abcd2f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,21 +159,25 @@ AM_GNU_GETTEXT_VERSION([0.17])
 AM_GLIB_GNU_GETTEXT
 AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME], [Define to the gettext package name.])
 
+dnl ================================================================
+dnl Use gvfs metadata or the old xml file store.
+dnl ================================================================
+
 if test "x$os_osx" != "xno" || test "x$os_win32" != "xno"; then
-	file_metadata_default="no"
+	gvfs_metadata_default="no"
 else
-	file_metadata_default="yes"
+	gvfs_metadata_default="yes"
 fi
 
-AC_ARG_ENABLE([file-metadata],
-	AS_HELP_STRING([--enable-file-metadata], [Enable file metadata]),
-	[enable_file_metadata=$enableval],
-	[enable_file_metadata=$file_metadata_default])
+AC_ARG_ENABLE([gvfs-metadata],
+	AS_HELP_STRING([--enable-gvfs-metadata], [Enable using gvfs to store metadata]),
+	[enable_gvfs_metadata=$enableval],
+	[enable_gvfs_metadata=$file_metadata_default])
 
-AM_CONDITIONAL(ENABLE_FILE_METADATA, test "x$enable_file_metadata" != "xno")
+AM_CONDITIONAL(ENABLE_GVFS_METADATA, test "x$enable_gvfs_metadata" != "xno")
 
-if test "x$enable_file_metadata" != "xno"; then
-	AC_DEFINE([ENABLE_FILE_METADATA], [1], [Define to enable file metadata])
+if test "x$enable_gvfs_metadata" != "xno"; then
+	AC_DEFINE([ENABLE_GVFS_METADATA], [1], [Define to enable using gvfs metadata])
 fi
 
 dnl ================================================================
@@ -563,6 +567,7 @@ Configuration:
 	Compiler:		${CC}
 	Python Plugins Support: $enable_python
 	Spell Plugin enabled:	$enable_enchant
+	Gvfs metadata enabled:	$enable_gvfs_metadata
 "
 
 if expr ${GEDIT_MINOR_VERSION} % 2 > /dev/null; then
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index c707a68..7cd2502 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -117,7 +117,7 @@ INST_H_FILES =				\
 	gedit-view.h 			\
 	gedit-window.h
 
-if !ENABLE_FILE_METADATA
+if !ENABLE_GVFS_METADATA
 INST_H_FILES += gedit-metadata-manager.h
 endif
 
@@ -188,7 +188,7 @@ libgedit_la_SOURCES = 			\
 	$(NOINST_H_FILES)		\
 	$(INST_H_FILES)
 
-if !ENABLE_FILE_METADATA
+if !ENABLE_GVFS_METADATA
 libgedit_la_SOURCES += gedit-metadata-manager.c 
 endif
 
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index 0f9b56d..d961226 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -52,7 +52,7 @@
 #include "gedit-enum-types.h"
 #include "gedittextregion.h"
 
-#ifndef ENABLE_FILE_METADATA
+#ifndef ENABLE_GVFS_METADATA
 #include "gedit-metadata-manager.h"
 #else
 #define METADATA_QUERY "metadata::*"
@@ -745,7 +745,7 @@ on_uri_changed (GeditDocument *doc,
 		GParamSpec    *pspec,
 		gpointer       useless)
 {
-#ifdef ENABLE_FILE_METADATA
+#ifdef ENABLE_GVFS_METADATA
 	GFile *location;
 
 	location = gedit_document_get_location (doc);
@@ -2571,7 +2571,7 @@ _gedit_document_create_mount_operation (GeditDocument *doc)
 						           doc->priv->mount_operation_userdata);
 }
 
-#ifndef ENABLE_FILE_METADATA
+#ifndef ENABLE_GVFS_METADATA
 gchar *
 gedit_document_get_metadata (GeditDocument *doc,
 			     const gchar   *key)
diff --git a/gedit/gedit-gio-document-loader.c b/gedit/gedit-gio-document-loader.c
index a4ad128..e516989 100644
--- a/gedit/gedit-gio-document-loader.c
+++ b/gedit/gedit-gio-document-loader.c
@@ -45,6 +45,10 @@
 #include "gedit-debug.h"
 #include "gedit-utils.h"
 
+#ifndef ENABLE_GVFS_METADATA
+#include "gedit-metadata-manager.h"
+#endif
+
 typedef struct
 {
 	GeditGioDocumentLoader *loader;
@@ -189,7 +193,7 @@ get_metadata_encoding (GeditDocumentLoader *loader)
 {
 	const GeditEncoding *enc = NULL;
 
-#ifdef G_OS_WIN32
+#ifndef ENABLE_GVFS_METADATA
 	gchar *charset;
 	const gchar *uri;
 
diff --git a/gedit/gedit.c b/gedit/gedit.c
index e53437e..27911a1 100644
--- a/gedit/gedit.c
+++ b/gedit/gedit.c
@@ -66,7 +66,6 @@
 #include <conio.h>
 #define _WIN32_WINNT 0x0500
 #include <windows.h>
-#include "gedit-metadata-manager.h"
 #define DATADIR SAVE_DATADIR
 #undef SAVE_DATADIR
 #endif
@@ -77,6 +76,10 @@
 #include "osx/gedit-osx.h"
 #endif
 
+#ifndef ENABLE_GVFS_METADATA
+#include "gedit-metadata-manager.h"
+#endif
+
 static guint32 startup_timestamp = 0;
 
 #ifndef G_OS_WIN32
@@ -753,7 +756,7 @@ main (int argc, char *argv[])
 	g_object_unref (engine);
 	gedit_prefs_manager_app_shutdown ();
 
-#ifdef G_OS_WIN32
+#ifndef ENABLE_GVFS_METADATA
 	gedit_metadata_manager_shutdown ();
 #endif