* Some fixes

[modest] / src / modest-conf.c

diff --git a/src/modest-conf.c b/src/modest-conf.c
index 3fc3509..ca44ae0 100644 (file)
--- a/src/modest-conf.c
+++ b/src/modest-conf.c
@@ -29,14 +29,18 @@
 
 #include <gconf/gconf-client.h>
 #include <string.h>
+#include <glib/gi18n.h>
 #include "modest-conf.h"
 #include "modest-marshal.h"
+#include <stdio.h>
 
 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 +54,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;
 
@@ -223,33 +227,17 @@ GSList *
 modest_conf_get_list (ModestConf* self, const gchar* key, ModestConfValueType list_type,
                      GError **err)
 {
-       ModestConfPrivate *priv;
-       GConfValueType gconf_type;
+       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);
+       g_return_val_if_fail (self, NULL);
+       g_return_val_if_fail (key,  NULL);
+
+       priv = MODEST_CONF_GET_PRIVATE(self);
+
+       gconf_type = modest_conf_type_to_gconf_type (list_type, err);
+
+       return gconf_client_get_list (priv->gconf_client, key, gconf_type, err);
 }
 
 
@@ -263,6 +251,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);
 
@@ -315,6 +304,46 @@ modest_conf_set_bool (ModestConf* self, const gchar* key, gboolean val,
 }
 
 
+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", key);
+               g_slist_free(debug_list);
+       }
+       
+       return result;
+}
 
 
 GSList*
@@ -378,7 +407,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));
 }
 
@@ -398,8 +428,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)
@@ -415,3 +444,29 @@ modest_conf_on_change (GConfClient *client, guint conn_id, GConfEntry *entry,
                       key, event);
 }
 
+static GConfValueType
+modest_conf_type_to_gconf_type (ModestConfValueType value_type, GError **err)
+{
+       GConfValueType gconf_type;
+
+       switch (value_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:
+               /* 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;
+}