#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);
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;
modest_conf_get_list (ModestConf* self, const gchar* key, ModestConfValueType list_type,
GError **err)
{
- ModestConfPrivate *priv;
- GConfValueType gconf_type;
- GSList *retval = NULL;
+ 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);
+ g_return_val_if_fail (self, NULL);
+ g_return_val_if_fail (key, NULL);
- gconf_type = modest_conf_type_to_gconf_type (list_type, err);
+ priv = MODEST_CONF_GET_PRIVATE(self);
- if (!err)
- retval = gconf_client_get_list (priv->gconf_client, key, gconf_type, err);
+ 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);
}
}
-void
+gboolean
modest_conf_set_list (ModestConf* self, const gchar* key,
GSList *val, ModestConfValueType list_type,
GError **err)
{
- ModestConfPrivate *priv;
- GConfValueType gconf_type;
+ ModestConfPrivate *priv;
+ GConfValueType gconf_type;
+ gboolean result;
- 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);
+ priv = MODEST_CONF_GET_PRIVATE(self);
- gconf_type = modest_conf_type_to_gconf_type (list_type, err);
+ 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);
+ 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;
}
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));
}
}
-
-
+/* 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)
break;
default:
/* FIXME: use MODEST_ERROR, and error code */
- *err = g_error_new_literal (0, 0, _("Invalid list value type"));
- }
+ 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;
}