#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,
}
-
-gchar*
-modest_conf_get_string_or_default (ModestConf* self, const gchar* key,
- const gchar *defaultval)
+GSList *
+modest_conf_get_list (ModestConf* self, const gchar* key, ModestConfValueType list_type,
+ GError **err)
{
- ModestConfPrivate *priv;
- GConfValue *val;
- const gchar *str;
+ ModestConfPrivate *priv;
+ GConfValueType gconf_type;
+
+ g_return_val_if_fail (self, NULL);
+ g_return_val_if_fail (key, NULL);
- g_return_val_if_fail (self, g_strdup(defaultval));
- g_return_val_if_fail (key, g_strdup(defaultval));
+ priv = MODEST_CONF_GET_PRIVATE(self);
- priv = MODEST_CONF_GET_PRIVATE(self);
- val = gconf_client_get (priv->gconf_client, key, NULL);
+ gconf_type = modest_conf_type_to_gconf_type (list_type, err);
- 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)
-{
- 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;
+ return gconf_client_get_list (priv->gconf_client, key, gconf_type, err);
}
}
+gboolean
+modest_conf_set_list (ModestConf* self, const gchar* key,
+ GSList *val, ModestConfValueType list_type,
+ GError **err)
+{
+ ModestConfPrivate *priv;
+ GConfValueType gconf_type;
+
+ 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;
+
+
+ gboolean 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*
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);
+}
+/* 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)
key, event);
}
-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);
+ GConfValueType gconf_type = 0;
- switch (list_type) {
+ switch (value_type) {
case MODEST_CONF_VALUE_INT:
gconf_type = GCONF_VALUE_INT;
break;
gconf_type = GCONF_VALUE_STRING;
break;
default:
- return NULL;
+ /* FIXME: use MODEST_ERROR, and error code */
+ *err = g_error_new_literal (0, 0, _("Invalid list value type"));
}
-
- return gconf_client_get_list (priv->gconf_client, key, gconf_type, err);
+ return gconf_type;
}
projects / modest / blobdiff