X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-conf.c;h=767f5b90c9ecf2e97a1105ed757a99262042ec54;hb=a8d18c7cdfb4239dc9e36f01f5a9a4cb9ce13032;hp=3f6e246db4379ed3220327f0a9f406c80645d670;hpb=64fcc38982f13e79e4acf8a3c96deacbf6b32688;p=modest diff --git a/src/modest-conf.c b/src/modest-conf.c index 3f6e246..767f5b9 100644 --- a/src/modest-conf.c +++ b/src/modest-conf.c @@ -36,17 +36,17 @@ #include static void modest_conf_class_init (ModestConfClass *klass); + static void modest_conf_init (ModestConf *obj); + static void modest_conf_finalize (GObject *obj); + static void modest_conf_on_change (GConfClient *client, guint conn_id, GConfEntry *entry, gpointer data); + static GConfValueType modest_conf_type_to_gconf_type (ModestConfValueType value_type, GError **err); - -static void -modest_conf_maemo_fake_on_change (ModestConf *conf, const gchar* key, ModestConfEvent event); - /* list my signals */ enum { KEY_CHANGED_SIGNAL, @@ -106,8 +106,8 @@ modest_conf_class_init (ModestConfClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ModestConfClass,key_changed), NULL, NULL, - modest_marshal_VOID__STRING_INT, - G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT); + modest_marshal_VOID__STRING_INT_INT, + G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT); } static void @@ -115,7 +115,7 @@ modest_conf_init (ModestConf *obj) { GConfClient *conf = NULL; ModestConfPrivate *priv = MODEST_CONF_GET_PRIVATE(obj); - GError *err = NULL; +/* GError *err = NULL; */ priv->gconf_client = NULL; @@ -125,27 +125,27 @@ modest_conf_init (ModestConf *obj) g_printerr ("modest: could not get gconf client\n"); return; } - gconf_client_add_dir (conf,MODEST_CONF_NAMESPACE, - GCONF_CLIENT_PRELOAD_NONE, - &err); - if (err) { - g_printerr ("modest: error %d with gconf_client_add_dir: '%s'\n", - err->code, err->message); - g_object_unref (conf); - g_error_free (err); - return; - } +/* gconf_client_add_dir (conf,MODEST_CONF_NAMESPACE, */ +/* GCONF_CLIENT_PRELOAD_NONE, */ +/* &err); */ +/* if (err) { */ +/* g_printerr ("modest: error %d with gconf_client_add_dir: '%s'\n", */ +/* err->code, err->message); */ +/* g_object_unref (conf); */ +/* g_error_free (err); */ +/* return; */ +/* } */ - gconf_client_notify_add (conf, MODEST_CONF_NAMESPACE, - modest_conf_on_change, - obj, NULL, &err); - if (err) { - g_printerr ("modest: gconf_client_notify_add error %d: '%s'\n", - err->code, err->message); - g_object_unref (conf); - g_error_free (err); - return; - } +/* gconf_client_notify_add (conf, MODEST_CONF_NAMESPACE, */ +/* modest_conf_on_change, */ +/* obj, NULL, &err); */ +/* if (err) { */ +/* g_printerr ("modest: gconf_client_notify_add error %d: '%s'\n", */ +/* err->code, err->message); */ +/* g_object_unref (conf); */ +/* g_error_free (err); */ +/* return; */ +/* } */ priv->gconf_client = conf; /* all went well! */ } @@ -265,14 +265,9 @@ modest_conf_set_string (ModestConf* self, const gchar* key, const gchar* val, return FALSE; } - if (gconf_client_set_string (priv->gconf_client, key, val, err)) { - modest_conf_maemo_fake_on_change (self, key, MODEST_CONF_EVENT_KEY_CHANGED); - return TRUE; - } else - return FALSE; + return gconf_client_set_string (priv->gconf_client, key, val, err); } - gboolean modest_conf_set_int (ModestConf* self, const gchar* key, gint val, GError **err) @@ -289,11 +284,7 @@ modest_conf_set_int (ModestConf* self, const gchar* key, gint val, return FALSE; } - if (gconf_client_set_int (priv->gconf_client, key, val, err)) { - modest_conf_maemo_fake_on_change (self, key, MODEST_CONF_EVENT_KEY_CHANGED); - return TRUE; - } else - return FALSE; + return gconf_client_set_int (priv->gconf_client, key, val, err); } @@ -313,11 +304,7 @@ modest_conf_set_bool (ModestConf* self, const gchar* key, gboolean val, return FALSE; } - if (gconf_client_set_bool (priv->gconf_client, key, val, err)) { - modest_conf_maemo_fake_on_change (self, key, MODEST_CONF_EVENT_KEY_CHANGED); - return TRUE; - } else - return FALSE; + return gconf_client_set_bool (priv->gconf_client, key, val, err); } @@ -355,12 +342,10 @@ modest_conf_set_list (ModestConf* self, const gchar* key, if(debug_list_length_start != debug_list_length_after) g_warning("modest_conf_set_list(): The list length after setting is " - "not the same as the specified list. key=%s", key); + "not the same as the specified list. key=%s. " + "We think that we fixed this, so tell us if you see this.", key); g_slist_free(debug_list); } - - if (result) - modest_conf_maemo_fake_on_change (self, key, MODEST_CONF_EVENT_KEY_CHANGED); return result; } @@ -394,11 +379,7 @@ modest_conf_remove_key (ModestConf* self, const gchar* key, GError **err) retval = gconf_client_recursive_unset (priv->gconf_client,key,0,err); gconf_client_suggest_sync (priv->gconf_client, NULL); - if (retval) { - modest_conf_maemo_fake_on_change (self, key, MODEST_CONF_EVENT_KEY_UNSET); - return TRUE; - } else - return FALSE; + return retval; } @@ -451,20 +432,12 @@ modest_conf_key_is_valid (const gchar* key) return gconf_valid_key (key, NULL); } -/* hmmm... might need to make specific callback for specific keys */ static void -modest_conf_on_change (GConfClient *client, guint conn_id, GConfEntry *entry, +modest_conf_on_change (GConfClient *client, + guint conn_id, + GConfEntry *entry, gpointer data) { - /* - * on maemo, there's a nasty bug in gconf, which makes it really - * slow, for updates and notifications. as an ugly hack, we turn off all - * gconf-based notifications, and send them ourselves, a short time - * after we do a change. this does not work for non-modest-conf - * changes of course... - */ -#ifndef MODEST_PLATFORM_MAEMO - ModestConfEvent event; const gchar* key; @@ -473,8 +446,7 @@ modest_conf_on_change (GConfClient *client, guint conn_id, GConfEntry *entry, g_signal_emit (G_OBJECT(data), signals[KEY_CHANGED_SIGNAL], 0, - key, event); -#endif /*!MODEST_PLATFORM_MAEMO*/ + key, event, conn_id); } @@ -505,72 +477,57 @@ modest_conf_type_to_gconf_type (ModestConfValueType value_type, GError **err) return gconf_type; } +ModestConfNotificationId +modest_conf_listen_to_namespace (ModestConf *self, + const gchar *namespace) +{ + ModestConfPrivate *priv; + GError *error = NULL; + ModestConfNotificationId notification_id; + g_return_val_if_fail (MODEST_IS_CONF (self), 0); + g_return_val_if_fail (namespace, 0); + + priv = MODEST_CONF_GET_PRIVATE(self); -//////////////////////////////////////////////////////////////////////////////// -/* workaround for the b0rked dbus-gconf on maemo */ -/* fires a fake change notification after 0.3 secs */ -#ifdef MODEST_PLATFORM_MAEMO -typedef struct { - GObject *obj; - gchar *key; -} ChangeHelper; - - -ChangeHelper* -change_helper_new (ModestConf *conf, const gchar *key) -{ - ChangeHelper *helper = g_slice_alloc (sizeof(ChangeHelper)); - helper->obj = g_object_ref(G_OBJECT(conf)); - helper->key = g_strdup (key); - return helper; + /* Add the namespace to the list of the namespaces that will + be observed */ + gconf_client_add_dir (priv->gconf_client, namespace, + GCONF_CLIENT_PRELOAD_NONE, + &error); + + if (error) + return 0; + + /* Notify every change under namespace */ + notification_id = gconf_client_notify_add (priv->gconf_client, + namespace, + modest_conf_on_change, + self, + NULL, + &error); + if (error) + return 0; + else + return notification_id; } -static void -change_helper_free (ChangeHelper *helper) +void +modest_conf_forget_namespace (ModestConf *self, + const gchar *namespace, + ModestConfNotificationId id) { - g_object_unref (helper->obj); - g_free (helper->key); - helper->key = NULL; - helper->obj = NULL; - g_slice_free (ChangeHelper,helper); -} + ModestConfPrivate *priv; -static gboolean -emit_change_cb (ChangeHelper *helper) -{ - if (!helper) - return FALSE; - g_signal_emit (G_OBJECT(helper->obj),signals[KEY_CHANGED_SIGNAL], 0, - helper->key, MODEST_CONF_EVENT_KEY_CHANGED); - change_helper_free (helper); + g_return_if_fail (MODEST_IS_CONF (self)); + g_return_if_fail (namespace); - return FALSE; -} + priv = MODEST_CONF_GET_PRIVATE(self); -static gboolean -emit_remove_cb (ChangeHelper *helper) -{ - if (!helper) - return FALSE; - g_signal_emit (G_OBJECT(helper->obj),signals[KEY_CHANGED_SIGNAL], 0, - helper->key, MODEST_CONF_EVENT_KEY_UNSET); - change_helper_free (helper); - - return FALSE; -} -#endif /* MODEST_PLATFORM_MAEMO */ - -static void -modest_conf_maemo_fake_on_change (ModestConf *conf, const gchar* key, ModestConfEvent event) -{ -#ifdef MODEST_PLATFORM_MAEMO - - ChangeHelper *helper = change_helper_new (conf,key); - g_timeout_add (100, /* after 100 ms */ - (event == MODEST_CONF_EVENT_KEY_CHANGED) - ? (GSourceFunc)emit_change_cb : (GSourceFunc)emit_remove_cb, - (gpointer)helper); -#endif /*MODEST_PLATFORM_MAEMO*/ + /* Remove the namespace to the list of the namespaces that will + be observed */ + gconf_client_remove_dir (priv->gconf_client, namespace, NULL); + + /* Notify every change under namespace */ + gconf_client_notify_remove (priv->gconf_client, id); } -//////////////////////////////////////////////////////////////////////////////////