* all:

[modest] / src / modest-conf.c

diff --git a/src/modest-conf.c b/src/modest-conf.c
index 3bffdfb..3fc3509 100644 (file)
--- a/src/modest-conf.c
+++ b/src/modest-conf.c
@@ -70,6 +70,7 @@ modest_conf_get_type (void)
                        sizeof(ModestConf),
                        1,              /* n_preallocs */
                        (GInstanceInitFunc) modest_conf_init,
+                       NULL
                };
                my_type = g_type_register_static (G_TYPE_OBJECT,
                                                  "ModestConf",
@@ -150,6 +151,8 @@ modest_conf_finalize (GObject *obj)
                g_object_unref (priv->gconf_client);
                priv->gconf_client = NULL;
        }       
+
+       G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
 ModestConf*
@@ -216,54 +219,37 @@ 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);
-
-       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);
-       }       
-
-       return retval;
+       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) {
+       case MODEST_CONF_VALUE_INT:
+               gconf_type = GCONF_VALUE_INT;
+               break;
+       case MODEST_CONF_VALUE_BOOL:
+               gconf_type = GCONF_VALUE_BOOL;
+               break;
+       case MODEST_CONF_VALUE_FLOAT:
+               gconf_type = GCONF_VALUE_FLOAT;
+               break;
+       case MODEST_CONF_VALUE_STRING:
+               gconf_type = GCONF_VALUE_STRING;
+               break;
+       default:
+               g_printerr ("modest: invalid list type %d requested\n", list_type);
+              /* FIXME: fill GError */
+              return NULL;
+       }
+       return gconf_client_get_list (priv->gconf_client, key, gconf_type, err);
 }
 
 
@@ -349,13 +335,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;
 }
 
 
@@ -363,9 +353,7 @@ gboolean
 modest_conf_key_exists (ModestConf* self, const gchar* key, GError **err)
 {
        ModestConfPrivate *priv;
-       gboolean dir_exists;
        GConfValue *val;
-       const gchar *str;
 
        g_return_val_if_fail (self,FALSE);
        g_return_val_if_fail (key, FALSE);
@@ -375,7 +363,7 @@ modest_conf_key_exists (ModestConf* self, const gchar* key, GError **err)
        /* the fast way... */
        if (gconf_client_dir_exists (priv->gconf_client,key,err))
                return TRUE;
-
+       
        val = gconf_client_get (priv->gconf_client, key, NULL);
        if (!val)
                return FALSE;
@@ -387,7 +375,7 @@ 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);
 
@@ -396,13 +384,20 @@ modest_conf_key_escape (ModestConf *self, const gchar* 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
@@ -419,3 +414,4 @@ modest_conf_on_change (GConfClient *client, guint conn_id, GConfEntry *entry,
                       signals[KEY_CHANGED_SIGNAL], 0,
                       key, event);
 }
+