2007-04-05 Murray Cumming <murrayc@murrayc.com>

[modest] / src / modest-conf.c

diff --git a/src/modest-conf.c b/src/modest-conf.c
index 01a90bc..183ef1b 100644 (file)
--- a/src/modest-conf.c
+++ b/src/modest-conf.c
@@ -228,7 +228,6 @@ modest_conf_get_list (ModestConf* self, const gchar* key, ModestConfValueType li
 {
        ModestConfPrivate *priv;
        GConfValueType gconf_type;
-       GSList *retval = NULL;
        
        g_return_val_if_fail (self, NULL);
        g_return_val_if_fail (key,  NULL);
@@ -237,10 +236,7 @@ modest_conf_get_list (ModestConf* self, const gchar* key, ModestConfValueType li
 
        gconf_type = modest_conf_type_to_gconf_type (list_type, err);
 
-       if (!err)
-              retval = gconf_client_get_list (priv->gconf_client, key, gconf_type, err);
-
-       return retval;
+       return gconf_client_get_list (priv->gconf_client, key, gconf_type, err);
 }
 
 
@@ -306,7 +302,7 @@ modest_conf_set_bool (ModestConf* self, const gchar* key, gboolean val,
 }
 
 
-void 
+gboolean
 modest_conf_set_list (ModestConf* self, const gchar* key, 
                      GSList *val, ModestConfValueType list_type, 
                      GError **err)
@@ -314,15 +310,16 @@ modest_conf_set_list (ModestConf* self, const gchar* key,
        ModestConfPrivate *priv;
        GConfValueType gconf_type;
        
-       g_return_if_fail (self);
-       g_return_if_fail (key);
+       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;
 
-       if (!err)
-              gconf_client_set_list (priv->gconf_client, key, gconf_type, val, err);
+       return gconf_client_set_list (priv->gconf_client, key, gconf_type, val, err);
 }
 
 
@@ -387,7 +384,8 @@ gchar*
 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));
 }
 
@@ -407,8 +405,7 @@ modest_conf_key_is_valid (const gchar* key)
 }
 
 
-
-
+/* hmmm... might need to make specific callback for specific keys */
 static void
 modest_conf_on_change (GConfClient *client, guint conn_id, GConfEntry *entry,
                       gpointer data)