[tracker/tracker-0.10] libtracker-common: Reading locale from gconf-dbus is only for meegotouch

[Martyn James Russell <mr src gnome org>]

commit acdb479b54f52267e5cf0dedab883441cad2b624
Author: Philip Van Hoof <philip codeminded be>
Date:   Tue Apr 26 11:49:41 2011 +0200

    libtracker-common: Reading locale from gconf-dbus is only for meegotouch

 src/libtracker-common/Makefile.am                |    2 +-
 src/libtracker-common/tracker-locale-gconfdbus.c |    8 ++++----
 src/libtracker-common/tracker-locale.c           |   22 +++++++++++-----------
 3 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 897a4ac..b2d9f09 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -63,7 +63,7 @@ libtracker_common_la_SOURCES += tracker-language.c
 noinst_HEADERS += tracker-language.h
 endif
 
-if HAVE_MAEMO
+if HAVE_MEEGOTOUCH
 libtracker_common_la_SOURCES += tracker-locale-gconfdbus.c
 noinst_HEADERS += tracker-locale-gconfdbus.h
 endif
diff --git a/src/libtracker-common/tracker-locale-gconfdbus.c b/src/libtracker-common/tracker-locale-gconfdbus.c
index 6db594c..94c9d07 100644
--- a/src/libtracker-common/tracker-locale-gconfdbus.c
+++ b/src/libtracker-common/tracker-locale-gconfdbus.c
@@ -51,7 +51,7 @@ static guint watch_name_id = 0;
 static guint registration_id = 0;
 static GStaticMutex subscribers_mutex = G_STATIC_MUTEX_INIT;
 GDBusNodeInfo *introspection_data = NULL;
-static gboolean maemo_mode = TRUE;
+static gboolean meegotouch_mode = TRUE;
 static gboolean first_time = TRUE;
 
 /* gconf keys for tracker locales, as defined in:
@@ -295,7 +295,7 @@ on_gconfd_dbus_disappeared  (GDBusConnection *connection,
 void
 tracker_locale_gconfdbus_init (void)
 {
-	if (!g_getenv (TRACKER_DISABLE_MEEGOTOUCH_LOCALE_ENV) && maemo_mode) {
+	if (!g_getenv (TRACKER_DISABLE_MEEGOTOUCH_LOCALE_ENV) && meegotouch_mode) {
 		GError *error = NULL;
 		GVariant *reply;
 		guint i;
@@ -334,11 +334,11 @@ tracker_locale_gconfdbus_init (void)
 			if (error->code == G_DBUS_ERROR_UNKNOWN_METHOD) {
 				g_warning ("GetDefaultDatabase doesn't exist on %s, this GConf "
 				           "doesn't look like a gconf-dbus.\n"
-				           "Continuing in non-maemo mode",
+				           "Continuing in non-meegotouch mode",
 				           GCONF_DBUS_SERVER_OBJECT);
 				g_object_unref (connection);
 				connection = NULL;
-				maemo_mode = FALSE;
+				meegotouch_mode = FALSE;
 				return;
 			} else {
 				g_critical ("%s", error->message);
diff --git a/src/libtracker-common/tracker-locale.c b/src/libtracker-common/tracker-locale.c
index dc87d90..0f11620 100644
--- a/src/libtracker-common/tracker-locale.c
+++ b/src/libtracker-common/tracker-locale.c
@@ -26,9 +26,9 @@
 
 #include "tracker-locale.h"
 
-#ifdef HAVE_MAEMO
+#ifdef HAVE_MEEGOTOUCH
 #include "tracker-locale-gconfdbus.h"
-#endif /* HAVE_MAEMO */
+#endif /* HAVE_MEEGOTOUCH */
 
 /* Current locales in use. They will be stored in heap and available throughout
  * the whole program execution, so will be reported as still reachable by Valgrind.
@@ -104,9 +104,9 @@ tracker_locale_set (TrackerLocaleID  id,
 void
 tracker_locale_shutdown (void)
 {
-#ifdef HAVE_MAEMO
+#ifdef HAVE_MEEGOTOUCH
 	tracker_locale_gconfdbus_shutdown ();
-#endif /* HAVE_MAEMO */
+#endif /* HAVE_MEEGOTOUCH */
 }
 
 void
@@ -114,11 +114,11 @@ tracker_locale_init (void)
 {
 	guint i;
 
-#ifdef HAVE_MAEMO
+#ifdef HAVE_MEEGOTOUCH
 	tracker_locale_gconfdbus_init ();
-#endif /* HAVE_MAEMO */
+#endif /* HAVE_MEEGOTOUCH */
 
-	/* Initialize those not retrieved from gconf, or if not in maemo */
+	/* Initialize those not retrieved from gconf, or if not in meegotouch */
 	for (i = 0; i < TRACKER_LOCALE_LAST; i++) {
 		if (!current_locales[i]) {
 			const gchar *env_locale;
@@ -182,20 +182,20 @@ tracker_locale_notify_add (TrackerLocaleID         id,
                            gpointer                user_data,
                            GFreeFunc               destroy_notify)
 {
-#ifdef HAVE_MAEMO
+#ifdef HAVE_MEEGOTOUCH
 	return tracker_locale_gconfdbus_notify_add (id, func, user_data, destroy_notify);
 #else
 	/* If not using gconf locales, this is a no-op... */
 	return NULL;
-#endif /* HAVE_MAEMO */
+#endif /* HAVE_MEEGOTOUCH */
 }
 
 void
 tracker_locale_notify_remove (gpointer notification_id)
 {
-#ifdef HAVE_MAEMO
+#ifdef HAVE_MEEGOTOUCH
 	return tracker_locale_gconfdbus_notify_remove (notification_id);
 #else
 	/* If not using gconf locales, this is a no-op... */
-#endif /* HAVE_MAEMO */
+#endif /* HAVE_MEEGOTOUCH */
 }