X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-conf.c;h=767f5b90c9ecf2e97a1105ed757a99262042ec54;hp=2a4d986233d82fa571d3da46fbe81c98d333dcbd;hb=40a8f5cbe03bd040fe3403dbfa6806df4fb6bc8a;hpb=e4d109458dbbdd8e28412c7e6c95e91e2b4c70e6 diff --git a/src/modest-conf.c b/src/modest-conf.c index 2a4d986..767f5b9 100644 --- a/src/modest-conf.c +++ b/src/modest-conf.c @@ -28,15 +28,25 @@ */ #include +#include #include +#include #include "modest-conf.h" #include "modest-marshal.h" +#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); + /* list my signals */ enum { KEY_CHANGED_SIGNAL, @@ -50,8 +60,8 @@ struct _ModestConfPrivate { GConfClient *gconf_client; }; #define MODEST_CONF_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ - MODEST_TYPE_CONF, \ - ModestConfPrivate)) + MODEST_TYPE_CONF, \ + ModestConfPrivate)) /* globals */ static GObjectClass *parent_class = NULL; @@ -96,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 @@ -105,7 +115,8 @@ 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; @@ -114,29 +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_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_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; */ +/* } */ priv->gconf_client = conf; /* all went well! */ } @@ -219,54 +228,21 @@ modest_conf_get_bool (ModestConf* self, const gchar* key, GError **err) } - -gchar* -modest_conf_get_string_or_default (ModestConf* self, const gchar* key, - const gchar *defaultval) -{ - ModestConfPrivate *priv; - GConfValue *val; - const gchar *str; - - g_return_val_if_fail (self, g_strdup(defaultval)); - g_return_val_if_fail (key, g_strdup(defaultval)); - - priv = MODEST_CONF_GET_PRIVATE(self); - val = gconf_client_get (priv->gconf_client, key, NULL); - - if (!val) - str = defaultval; - else { - str = gconf_value_get_string (val); - gconf_value_free (val); - } - - return g_strdup (str); -} - - -gint -modest_conf_get_int_or_default (ModestConf* self, const gchar* key, - gint defaultval) +GSList * +modest_conf_get_list (ModestConf* self, const gchar* key, ModestConfValueType list_type, + GError **err) { ModestConfPrivate *priv; - GConfValue *val; - gint retval; - - g_return_val_if_fail (self, defaultval); - g_return_val_if_fail (key, defaultval); + GConfValueType gconf_type; + + g_return_val_if_fail (self, NULL); + g_return_val_if_fail (key, NULL); priv = MODEST_CONF_GET_PRIVATE(self); - val = gconf_client_get (priv->gconf_client, key, NULL); - if (!val) - retval = defaultval; - else { - retval = gconf_value_get_int (val); - gconf_value_free (val); - } + gconf_type = modest_conf_type_to_gconf_type (list_type, err); - return retval; + return gconf_client_get_list (priv->gconf_client, key, gconf_type, err); } @@ -280,6 +256,7 @@ modest_conf_set_string (ModestConf* self, const gchar* key, const gchar* val, g_return_val_if_fail (self,FALSE); g_return_val_if_fail (key, FALSE); + g_return_val_if_fail (val, FALSE); priv = MODEST_CONF_GET_PRIVATE(self); @@ -288,10 +265,9 @@ modest_conf_set_string (ModestConf* self, const gchar* key, const gchar* val, return FALSE; } - return gconf_client_set_string (priv->gconf_client, key, val, err); + 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) @@ -308,7 +284,7 @@ modest_conf_set_int (ModestConf* self, const gchar* key, gint val, return FALSE; } - return gconf_client_set_int (priv->gconf_client, key, val, err); + return gconf_client_set_int (priv->gconf_client, key, val, err); } @@ -327,11 +303,52 @@ modest_conf_set_bool (ModestConf* self, const gchar* key, gboolean val, g_warning ("modest: '%s' is not writable\n", key); return FALSE; } - - return gconf_client_set_bool (priv->gconf_client,key,val, err); + + return gconf_client_set_bool (priv->gconf_client, key, val, err); } +gboolean +modest_conf_set_list (ModestConf* self, const gchar* key, + GSList *val, ModestConfValueType list_type, + GError **err) +{ + ModestConfPrivate *priv; + GConfValueType gconf_type; + gboolean result; + + g_return_val_if_fail (self, FALSE); + g_return_val_if_fail (key, FALSE); + + priv = MODEST_CONF_GET_PRIVATE(self); + + gconf_type = modest_conf_type_to_gconf_type (list_type, err); + if (*err) + return FALSE; + + result = gconf_client_set_list (priv->gconf_client, key, gconf_type, val, err); + if(*err) { + g_warning("gconf_client_set_list() failed with key=%s. error=%s", key, + (*err)->message); + result = FALSE; + } + + /* TODO: Remove this, when we fix the problem: */ + /* This shows that sometimes set_list fails, while saying that it succeeded: */ + if (result) { + const gint debug_list_length_start = g_slist_length(val); + GSList* debug_list = gconf_client_get_list(priv->gconf_client, key, gconf_type, err); + const gint debug_list_length_after = g_slist_length(debug_list); + + 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. " + "We think that we fixed this, so tell us if you see this.", key); + g_slist_free(debug_list); + } + + return result; +} GSList* @@ -352,13 +369,17 @@ gboolean modest_conf_remove_key (ModestConf* self, const gchar* key, GError **err) { ModestConfPrivate *priv; + gboolean retval; g_return_val_if_fail (self,FALSE); g_return_val_if_fail (key, FALSE); priv = MODEST_CONF_GET_PRIVATE(self); - return gconf_client_recursive_unset (priv->gconf_client,key,0,err); + retval = gconf_client_recursive_unset (priv->gconf_client,key,0,err); + gconf_client_suggest_sync (priv->gconf_client, NULL); + + return retval; } @@ -388,26 +409,33 @@ modest_conf_key_exists (ModestConf* self, const gchar* key, GError **err) gchar* -modest_conf_key_escape (ModestConf *self, const gchar* key) +modest_conf_key_escape (const gchar* key) { g_return_val_if_fail (key, NULL); - + g_return_val_if_fail (strlen (key) > 0, g_strdup (key)); + return gconf_escape_key (key, strlen(key)); } gchar* -modest_conf_key_unescape (ModestConf *self, const gchar* key) +modest_conf_key_unescape (const gchar* key) { g_return_val_if_fail (key, NULL); return gconf_unescape_key (key, strlen(key)); } - +gboolean +modest_conf_key_is_valid (const gchar* key) +{ + return gconf_valid_key (key, NULL); +} 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) { ModestConfEvent event; @@ -418,21 +446,16 @@ modest_conf_on_change (GConfClient *client, guint conn_id, GConfEntry *entry, g_signal_emit (G_OBJECT(data), signals[KEY_CHANGED_SIGNAL], 0, - key, event); + key, event, conn_id); } -GSList * -modest_conf_get_list (ModestConf* self, const gchar* key, ModestConfValueType list_type, GError **err) + +static GConfValueType +modest_conf_type_to_gconf_type (ModestConfValueType value_type, GError **err) { - ModestConfPrivate *priv; GConfValueType gconf_type; - - g_return_val_if_fail (self, NULL); - g_return_val_if_fail (key, NULL); - priv = MODEST_CONF_GET_PRIVATE(self); - - switch (list_type) { + switch (value_type) { case MODEST_CONF_VALUE_INT: gconf_type = GCONF_VALUE_INT; break; @@ -446,8 +469,65 @@ modest_conf_get_list (ModestConf* self, const gchar* key, ModestConfValueType li gconf_type = GCONF_VALUE_STRING; break; default: - return NULL; - } + /* FIXME: use MODEST_ERROR, and error code */ + gconf_type = GCONF_VALUE_INVALID; + g_printerr ("modest: invalid list value type %d\n", value_type); + *err = g_error_new_literal (0, 0, "invalid list value type"); + } + return gconf_type; +} - return gconf_client_get_list (priv->gconf_client, key, gconf_type, err); +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); + + /* 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; +} + +void +modest_conf_forget_namespace (ModestConf *self, + const gchar *namespace, + ModestConfNotificationId id) +{ + ModestConfPrivate *priv; + + g_return_if_fail (MODEST_IS_CONF (self)); + g_return_if_fail (namespace); + + priv = MODEST_CONF_GET_PRIVATE(self); + + /* 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); }