[tracker/collation-gconf-locale: 17/20] libtracker-common, libtracker-data: Remove tracker prefix from static functions

[Aleksander Morgado <aleksm src gnome org>]

commit 9522d01dbbbfaf95178620966e6485db2265d204
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Tue Nov 30 17:37:56 2010 +0100

    libtracker-common, libtracker-data: Remove tracker prefix from static functions

 src/libtracker-common/tracker-locale.c    |   28 ++++++++++++++--------------
 src/tracker-store/tracker-locale-change.c |   14 +++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/src/libtracker-common/tracker-locale.c b/src/libtracker-common/tracker-locale.c
index d1727aa..7e3d06e 100644
--- a/src/libtracker-common/tracker-locale.c
+++ b/src/libtracker-common/tracker-locale.c
@@ -70,7 +70,7 @@ static gboolean initialized;
 #define MEEGOTOUCH_LOCALE_DIR "/meegotouch/i18n"
 
 /* gconf keys for tracker locales, as defined in:
- * http://apidocs.meego.com/mtf/i18n.html
+ * http://apidocs.meego.com/1.0/mtf/i18n.html
  */
 static const gchar *gconf_locales[TRACKER_LOCALE_LAST] = {
 	MEEGOTOUCH_LOCALE_DIR "/language",
@@ -98,8 +98,8 @@ static GConfClient *client;
 
 
 static void
-tracker_locale_set (TrackerLocaleID  id,
-                    const gchar     *value)
+locale_set (TrackerLocaleID  id,
+            const gchar     *value)
 {
 	if (current_locales[id]) {
 		g_debug ("Locale '%s' was changed from '%s' to '%s'",
@@ -141,10 +141,10 @@ tracker_locale_set (TrackerLocaleID  id,
 }
 
 static void
-tracker_locale_gconf_notify_cb (GConfClient *client,
-                                guint cnxn_id,
-                                GConfEntry *entry,
-                                gpointer user_data)
+locale_gconf_notify_cb (GConfClient *client,
+                        guint        cnxn_id,
+                        GConfEntry  *entry,
+                        gpointer     user_data)
 {
 	guint i;
 	GConfValue *value;
@@ -195,7 +195,7 @@ tracker_locale_gconf_notify_cb (GConfClient *client,
 
 	/* Protect the locale change with the lock */
 	LOCK_LOCALES;
-	tracker_locale_set (i, gconf_value_get_string (value));
+	locale_set (i, gconf_value_get_string (value));
 	UNLOCK_LOCALES;
 
 	/* Now, if any subscriber, notify the locale change.
@@ -219,7 +219,7 @@ tracker_locale_gconf_notify_cb (GConfClient *client,
 #endif /* HAVE_MAEMO */
 
 static void
-tracker_locale_init (void)
+locale_init (void)
 {
 	guint i;
 
@@ -248,7 +248,7 @@ tracker_locale_init (void)
 			/* Request notifications */
 			gconf_client_notify_add (client,
 			                         MEEGOTOUCH_LOCALE_DIR,
-			                         tracker_locale_gconf_notify_cb,
+			                         locale_gconf_notify_cb,
 			                         NULL,
 			                         NULL,
 			                         &error);
@@ -284,7 +284,7 @@ tracker_locale_init (void)
 				gconf_value_free (val);
 			} else {
 				/* Set the new locale */
-				tracker_locale_set (i, gconf_value_get_string (val));
+				locale_set (i, gconf_value_get_string (val));
 				gconf_value_free (val);
 			}
 		}
@@ -320,9 +320,9 @@ tracker_locale_init (void)
 
 			if (!env_locale) {
 				g_warning ("Locale '%d' is not set, defaulting to C locale", i);
-				tracker_locale_set (i, "C");
+				locale_set (i, "C");
 			} else {
-				tracker_locale_set (i, env_locale);
+				locale_set (i, env_locale);
 			}
 		}
 	}
@@ -342,7 +342,7 @@ tracker_locale_get (TrackerLocaleID id)
 
 	/* Initialize if not already done */
 	if (!initialized)
-		tracker_locale_init ();
+		locale_init ();
 
 	/* Always return a duplicated string, as the locale may change at any
 	 * moment */
diff --git a/src/tracker-store/tracker-locale-change.c b/src/tracker-store/tracker-locale-change.c
index 7235e2c..5a7495c 100644
--- a/src/tracker-store/tracker-locale-change.c
+++ b/src/tracker-store/tracker-locale-change.c
@@ -47,7 +47,7 @@ static gpointer locale_notification_id;
 static gboolean locale_change_notified;
 
 static void
-tracker_locale_change_process_cb (gpointer user_data)
+locale_change_process_cb (gpointer user_data)
 {
 	TrackerStatus *notifier;
 	TrackerBusyCallback busy_callback;
@@ -78,7 +78,7 @@ tracker_locale_change_process_cb (gpointer user_data)
 }
 
 static gboolean
-tracker_locale_change_process_idle_cb (gpointer data)
+locale_change_process_idle_cb (gpointer data)
 {
 	TrackerLocaleChangeContext *ctxt;
 
@@ -94,14 +94,14 @@ tracker_locale_change_process_idle_cb (gpointer data)
 	/* Note: Right now, the passed callback may be called instantly and not
 	 * in an idle. */
 	g_message ("Setting tracker-store as inactive...");
-	tracker_store_set_active (FALSE, tracker_locale_change_process_cb, ctxt);
+	tracker_store_set_active (FALSE, locale_change_process_cb, ctxt);
 
 	return FALSE;
 }
 
 static void
-tracker_locale_notify_cb (TrackerLocaleID id,
-                          gpointer        user_data)
+locale_notify_cb (TrackerLocaleID id,
+                  gpointer        user_data)
 {
 	if (locale_change_notified) {
 		g_message ("Locale change was already notified, not doing it again");
@@ -115,7 +115,7 @@ tracker_locale_notify_cb (TrackerLocaleID id,
 		 * already locked mutex.
 		 */
 		g_message ("Locale change notified, preparing to rebuild indexes...");
-		g_idle_add (tracker_locale_change_process_idle_cb, NULL);
+		g_idle_add (locale_change_process_idle_cb, NULL);
 	}
 }
 
@@ -130,7 +130,7 @@ tracker_locale_change_initialize_subscription (void)
 	         collation_locale);
 
 	locale_notification_id = tracker_locale_notify_add (TRACKER_LOCALE_COLLATE,
-	                                                    tracker_locale_notify_cb,
+	                                                    locale_notify_cb,
 	                                                    NULL,
 	                                                    NULL);
 }