[tracker/tracker-0.10] libtracker-common: Remove reading meegotouch locale config over GConf
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/tracker-0.10] libtracker-common: Remove reading meegotouch locale config over GConf
- Date: Thu, 7 Apr 2011 13:43:36 +0000 (UTC)
commit 6d5515d1390b8583f3c8f32989486f0ea4e0562f
Author: Philip Van Hoof <philip codeminded be>
Date: Mon Apr 4 12:28:31 2011 +0200
libtracker-common: Remove reading meegotouch locale config over GConf
src/libtracker-common/tracker-locale.c | 285 +++-----------------------------
src/libtracker-common/tracker-locale.h | 19 ++-
2 files changed, 31 insertions(+), 273 deletions(-)
---
diff --git a/src/libtracker-common/tracker-locale.c b/src/libtracker-common/tracker-locale.c
index 3a00cb1..5fa9c4e 100644
--- a/src/libtracker-common/tracker-locale.c
+++ b/src/libtracker-common/tracker-locale.c
@@ -26,42 +26,12 @@
#include "tracker-locale.h"
-#ifdef HAVE_MAEMO
-#include <gconf/gconf-client.h>
-#endif /* HAVE_MAEMO */
-
-#ifdef HAVE_MAEMO
-
-/* In src/libtracker-sparql/tracker-init.c you'll find a first call to
- * gconf_client_get_default() in a function that has the GCC specific
- * construction attribute. This is there because GConfClient isn't thread-safe
- * or at least not "first call is in thread vs. mainloop"-safe. The reason
- * why it must be in libtracker-sparql instead of here is because this code
- * is entered using g_module_open (dlopen) by tracker_sparql_backend_load_
- * plugins_from_path: the construction attribute would only be detected at
- * dlopen, which would be in the thread that calls load_plugins_from_path
- * caused by a tracker_sparql_connection_get_async. It's a bit unfortunate
- * and perhaps ugly, but fortunately we only need it in HAVE_MAEMO */
-
-/* Mutex to sync access to the current locale values */
-static GStaticMutex locales_mutex = G_STATIC_MUTEX_INIT;
-static GStaticMutex subscribers_mutex = G_STATIC_MUTEX_INIT;
-#define LOCK_LOCALES g_static_mutex_lock (&locales_mutex)
-#define UNLOCK_LOCALES g_static_mutex_unlock (&locales_mutex)
-#define LOCK_SUBSCRIBERS g_static_mutex_lock (&subscribers_mutex)
-#define UNLOCK_SUBSCRIBERS g_static_mutex_unlock (&subscribers_mutex)
-#else
-/* If not using gconf locales, no need to acquire/release any lock */
-#define LOCK_LOCALES
-#define UNLOCK_LOCALES
-#endif /* HAVE_MAEMO */
-
/* 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.
*/
static gchar *current_locales[TRACKER_LOCALE_LAST];
-static gchar *locale_names[TRACKER_LOCALE_LAST] = {
+static const gchar *locale_names[TRACKER_LOCALE_LAST] = {
"TRACKER_LOCALE_LANGUAGE",
"TRACKER_LOCALE_TIME",
"TRACKER_LOCALE_COLLATE",
@@ -71,49 +41,21 @@ static gchar *locale_names[TRACKER_LOCALE_LAST] = {
/* Already initialized? */
static gboolean initialized;
+static GStaticRecMutex locales_mutex = G_STATIC_REC_MUTEX_INIT;
-#ifdef HAVE_MAEMO
-
-/* If this envvar is set, even if we have meegotouch locales in gconf,
- * we'll still use envvars */
-#define TRACKER_DISABLE_MEEGOTOUCH_LOCALE_ENV "TRACKER_DISABLE_MEEGOTOUCH_LOCALE"
-
-/* Base dir for all gconf locale values */
-#define MEEGOTOUCH_LOCALE_DIR "/meegotouch/i18n"
-
-/* gconf keys for tracker locales, as defined in:
- * http://apidocs.meego.com/1.0/mtf/i18n.html
- */
-static const gchar *gconf_locales[TRACKER_LOCALE_LAST] = {
- MEEGOTOUCH_LOCALE_DIR "/language",
- MEEGOTOUCH_LOCALE_DIR "/lc_time",
- MEEGOTOUCH_LOCALE_DIR "/lc_collate",
- MEEGOTOUCH_LOCALE_DIR "/lc_numeric",
- MEEGOTOUCH_LOCALE_DIR "/lc_monetary"
-};
-
-/* Structure to hold the notification data of each subscriber */
-typedef struct {
- TrackerLocaleID id;
- TrackerLocaleNotifyFunc func;
- gpointer user_data;
- GFreeFunc destroy_notify;
-} TrackerLocaleNotification;
-
-/* List of subscribers which want to get notified of locale changes */
-static GSList *subscribers;
-
-/* The gconf client, which will be created once at initialization and
- * the reference will never be destroyed, so will be reported as still
- * reachable by Valgrind */
-static GConfClient *client;
-
-#endif /* HAVE_MAEMO */
+const gchar*
+tracker_locale_get_name (guint i)
+{
+ g_return_val_if_fail (i < TRACKER_LOCALE_LAST, NULL);
+ return locale_names[i];
+}
-static void
-locale_set (TrackerLocaleID id,
- const gchar *value)
+void
+tracker_locale_set (TrackerLocaleID id,
+ const gchar *value)
{
+ g_static_rec_mutex_lock (&locales_mutex);
+
if (current_locales[id]) {
g_debug ("Locale '%s' was changed from '%s' to '%s'",
locale_names[id],
@@ -151,161 +93,16 @@ locale_set (TrackerLocaleID id,
g_warn_if_reached ();
break;
}
-}
-
-#ifdef HAVE_MAEMO
-
-static void
-locale_gconf_notify_cb (GConfClient *client,
- guint cnxn_id,
- GConfEntry *entry,
- gpointer user_data)
-{
- guint i;
- GConfValue *value;
- GSList *li;
- const gchar *string_value;
-
- /* Find the proper locale to change */
- for (i = 0; i < TRACKER_LOCALE_LAST; i++) {
- if (strcmp (gconf_locales[i], gconf_entry_get_key (entry)) == 0) {
- break;
- }
- }
-
- /* Oh, not found? */
- if (i == TRACKER_LOCALE_LAST) {
- g_debug ("Skipping change on gconf key '%s' as not really needed",
- gconf_entry_get_key (entry));
- return;
- }
-
- /* Ensure a proper value was set */
- value = gconf_entry_get_value (entry);
- if (!value) {
- g_warning ("Locale value for '%s' cannot be NULL, not changing %s",
- gconf_locales[i],
- locale_names[i]);
- return;
- }
- /* It must be a string */
- if (value->type != GCONF_VALUE_STRING) {
- g_warning ("Locale value for '%s' must be a string, not changing %s",
- gconf_locales[i],
- locale_names[i]);
- return;
- }
-
- string_value = gconf_value_get_string (value);
-
- /* String must have a length > 0 */
- if (!string_value ||
- string_value[0] == '\0') {
- g_warning ("Locale value for '%s' must not be empty, not changing %s",
- gconf_locales[i],
- locale_names[i]);
- return;
- }
-
- /* Protect the locale change with the lock */
- LOCK_LOCALES;
- locale_set (i, gconf_value_get_string (value));
- UNLOCK_LOCALES;
-
- /* Now, if any subscriber, notify the locale change.
- * NOTE!!!! The callback MUST NOT perform any action
- * that may change the list of subscribers, or the
- * program will get locked. */
- LOCK_SUBSCRIBERS;
- for (li = subscribers; li; li = g_slist_next (li)) {
- TrackerLocaleNotification *data = li->data;
-
- if (i == data->id) {
- g_debug ("Notifying locale '%s' change to subscriber '%p'",
- locale_names[i],
- data);
- data->func (i, data->user_data);
- }
- }
- UNLOCK_SUBSCRIBERS;
+ g_static_rec_mutex_unlock (&locales_mutex);
}
-#endif /* HAVE_MAEMO */
static void
locale_init (void)
{
guint i;
-#ifdef HAVE_MAEMO
- if (g_getenv (TRACKER_DISABLE_MEEGOTOUCH_LOCALE_ENV)) {
- g_message ("Retrieving locale from GConf is DISABLED");
- } else {
- GError *error = NULL;
-
- g_message ("Retrieving locale from GConf is ENABLED");
-
- /* Get default gconf client to query the locale values */
- client = gconf_client_get_default ();
-
- /* We want to be notified when locales are changed in gconf */
- gconf_client_add_dir (client,
- MEEGOTOUCH_LOCALE_DIR,
- GCONF_CLIENT_PRELOAD_ONELEVEL,
- &error);
- if (error) {
- g_warning ("Cannot add dir '%s' in gconf client: '%s'",
- MEEGOTOUCH_LOCALE_DIR,
- error->message);
- g_clear_error (&error);
- } else {
- /* Request notifications */
- gconf_client_notify_add (client,
- MEEGOTOUCH_LOCALE_DIR,
- locale_gconf_notify_cb,
- NULL,
- NULL,
- &error);
- if (error) {
- g_warning ("Cannot request notifications under dir '%s' in "
- "gconf client: '%s'",
- MEEGOTOUCH_LOCALE_DIR,
- error->message);
- g_clear_error (&error);
- }
- }
-
- /* And initialize all, should have been all preloaded in the
- * client already */
- for (i = 0; i < TRACKER_LOCALE_LAST; i++) {
- GConfValue *val;
-
- /* Get the gconf key, if any */
- val = gconf_client_get (client,
- gconf_locales[i],
- &error);
- if (!val) {
- g_warning ("Couldn't get value for key '%s'"
- " from gconf: '%s'"
- " Defaulting to environment locale.",
- gconf_locales[i],
- error ? error->message : "no such key");
- g_clear_error (&error);
- } else if (val->type != GCONF_VALUE_STRING) {
- g_warning ("Wrong type for '%s' key in gconf..."
- " Defaulting to environment locale.",
- gconf_locales[i]);
- gconf_value_free (val);
- } else {
- /* Set the new locale */
- locale_set (i, gconf_value_get_string (val));
- gconf_value_free (val);
- }
- }
- }
-#endif /* HAVE_MAEMO */
-
/* Initialize those not retrieved from gconf, or if not in maemo */
for (i = 0; i < TRACKER_LOCALE_LAST; i++) {
if (!current_locales[i]) {
@@ -335,9 +132,9 @@ locale_init (void)
if (!env_locale) {
g_warning ("Locale '%d' is not set, defaulting to C locale", i);
- locale_set (i, "C");
+ tracker_locale_set (i, "C");
} else {
- locale_set (i, env_locale);
+ tracker_locale_set (i, env_locale);
}
}
}
@@ -351,19 +148,18 @@ tracker_locale_get (TrackerLocaleID id)
{
gchar *locale;
- /* Lock even before checking if initialized, so that initialization is
- * not done twice */
- LOCK_LOCALES;
+ g_static_rec_mutex_lock (&locales_mutex);
/* Initialize if not already done */
- if (!initialized)
+ if (!initialized) {
locale_init ();
+ }
/* Always return a duplicated string, as the locale may change at any
* moment */
locale = g_strdup (current_locales[id]);
- UNLOCK_LOCALES;
+ g_static_rec_mutex_unlock (&locales_mutex);
return locale;
}
@@ -374,51 +170,10 @@ tracker_locale_notify_add (TrackerLocaleID id,
gpointer user_data,
GFreeFunc destroy_notify)
{
-#ifdef HAVE_MAEMO
- TrackerLocaleNotification *data;
-
- g_assert (func != NULL);
-
- data = g_slice_new (TrackerLocaleNotification);
- data->id = id;
- data->func = func;
- data->user_data = user_data;
- data->destroy_notify = destroy_notify;
-
- /* Lock list, we cannot! use the same lock as for locales here... */
- LOCK_SUBSCRIBERS;
- subscribers = g_slist_prepend (subscribers, data);
- UNLOCK_SUBSCRIBERS;
-
- return data;
-#else
- /* If not using gconf locales, this is a no-op... */
return NULL;
-#endif /* HAVE_MAEMO */
}
void
tracker_locale_notify_remove (gpointer notification_id)
{
-#ifdef HAVE_MAEMO
- GSList *li;
-
- LOCK_SUBSCRIBERS;
- li = g_slist_find (subscribers, notification_id);
- if (li) {
- TrackerLocaleNotification *data = li->data;
-
- /* Remove item from list of subscribers */
- subscribers = g_slist_delete_link (subscribers, li);
-
- /* Call the provided destroy_notify if any. */
- if (data->destroy_notify)
- data->destroy_notify (data->user_data);
- /* And fully dispose the notification data */
- g_slice_free (TrackerLocaleNotification, data);
- }
- UNLOCK_SUBSCRIBERS;
-#else
- /* If not using gconf locales, this is a no-op... */
-#endif /* HAVE_MAEMO */
}
diff --git a/src/libtracker-common/tracker-locale.h b/src/libtracker-common/tracker-locale.h
index 49dac0b..a7c2934 100644
--- a/src/libtracker-common/tracker-locale.h
+++ b/src/libtracker-common/tracker-locale.h
@@ -39,25 +39,28 @@ typedef enum {
} TrackerLocaleID;
/* Callback for the notification of locale changes */
-typedef void (* TrackerLocaleNotifyFunc) (TrackerLocaleID id,
- gpointer user_data);
+typedef void (* TrackerLocaleNotifyFunc) (TrackerLocaleID id,
+ gpointer user_data);
/* Get the current locale of the given type.
* Note that it returns a newly-allocated string which should be g_free()-ed
*/
-gchar *tracker_locale_get (TrackerLocaleID id);
+gchar *tracker_locale_get (TrackerLocaleID id);
/* Adds a new subscriber to locale change notifications.
* Returns a pointer which identifies the subscription.
*/
-gpointer tracker_locale_notify_add (TrackerLocaleID id,
- TrackerLocaleNotifyFunc func,
- gpointer user_data,
- GFreeFunc destroy_notify);
+gpointer tracker_locale_notify_add (TrackerLocaleID id,
+ TrackerLocaleNotifyFunc func,
+ gpointer user_data,
+ GFreeFunc destroy_notify);
/* Remove a given subscriber, passing the id you got in _add() */
-void tracker_locale_notify_remove (gpointer notification_id);
+void tracker_locale_notify_remove (gpointer notification_id);
+const gchar* tracker_locale_get_name (guint i);
+void tracker_locale_set (TrackerLocaleID id,
+ const gchar *value);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
