*/
#include <gconf/gconf-client.h>
+#include <config.h>
#include <string.h>
#include <glib/gi18n.h>
+#include "modest-defs.h"
#include "modest-conf.h"
+#include "modest-error.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,
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;
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ModestConfClass,key_changed),
NULL, NULL,
- modest_marshal_VOID__STRING_INT,
- G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT);
+ modest_marshal_VOID__STRING_INT_INT,
+ G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
}
static void
modest_conf_init (ModestConf *obj)
{
GConfClient *conf = NULL;
+ GError *error = NULL;
ModestConfPrivate *priv = MODEST_CONF_GET_PRIVATE(obj);
- GError *err = NULL;
-
+
priv->gconf_client = NULL;
conf = gconf_client_get_default ();
return;
}
- gconf_client_add_dir (conf,MODEST_CONF_NAMESPACE,
+ priv->gconf_client = conf;
+
+ /* All the tree will be listened */
+ gconf_client_add_dir (priv->gconf_client,
+ "/apps/modest",
GCONF_CLIENT_PRELOAD_NONE,
- &err);
- if (err) {
- g_printerr ("modest: error %d with gconf_client_add_dir: '%s'\n",
- err->code, err->message);
- g_object_unref (conf);
- g_error_free (err);
- return;
+ &error);
+
+ /* Notify every change under namespace */
+ if (!error) {
+ gconf_client_notify_add (priv->gconf_client,
+ "/apps/modest",
+ modest_conf_on_change,
+ obj,
+ NULL,
+ &error);
+ } else {
+ g_error_free (error);
}
-
- gconf_client_notify_add (conf, MODEST_CONF_NAMESPACE,
- modest_conf_on_change,
- obj, NULL, &err);
- if (err) {
- g_printerr ("modest: gconf_client_notify_add error %d: '%s'\n",
- err->code, err->message);
- g_object_unref (conf);
- g_error_free (err);
- return;
- }
-
- priv->gconf_client = conf; /* all went well! */
}
static void
return gconf_client_get_int (priv->gconf_client, key, err);
}
+gdouble
+modest_conf_get_float (ModestConf* self, const gchar* key, GError **err)
+{
+ ModestConfPrivate *priv;
+
+ g_return_val_if_fail (self, -1);
+ g_return_val_if_fail (key, -1);
+
+ priv = MODEST_CONF_GET_PRIVATE(self);
+
+ return gconf_client_get_float (priv->gconf_client, key, err);
+}
gboolean
modest_conf_get_bool (ModestConf* self, const gchar* key, GError **err)
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);
}
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);
return FALSE;
}
- return gconf_client_set_string (priv->gconf_client, key, val, err);
+ return gconf_client_set_string (priv->gconf_client, key, val, err);
}
-
gboolean
modest_conf_set_int (ModestConf* self, const gchar* key, gint val,
GError **err)
return FALSE;
}
- return gconf_client_set_int (priv->gconf_client, key, val, err);
+ return gconf_client_set_int (priv->gconf_client, key, val, err);
+}
+
+gboolean
+modest_conf_set_float (ModestConf* self,
+ const gchar* key,
+ gdouble val,
+ GError **err)
+{
+ ModestConfPrivate *priv;
+
+ g_return_val_if_fail (self,FALSE);
+ g_return_val_if_fail (key, FALSE);
+
+ priv = MODEST_CONF_GET_PRIVATE(self);
+
+ if (!gconf_client_key_is_writable(priv->gconf_client,key,err)) {
+ g_printerr ("modest: '%s' is not writable\n", key);
+ return FALSE;
+ }
+
+ return gconf_client_set_float (priv->gconf_client, key, val, err);
}
g_warning ("modest: '%s' is not writable\n", key);
return FALSE;
}
-
- return gconf_client_set_bool (priv->gconf_client,key,val, err);
+
+ return gconf_client_set_bool (priv->gconf_client, key, val, 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;
- 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)
- 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);
}
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));
}
return gconf_valid_key (key, NULL);
}
-
-
-
static void
-modest_conf_on_change (GConfClient *client, guint conn_id, GConfEntry *entry,
+modest_conf_on_change (GConfClient *client,
+ guint conn_id,
+ GConfEntry *entry,
gpointer data)
{
ModestConfEvent event;
g_signal_emit (G_OBJECT(data),
signals[KEY_CHANGED_SIGNAL], 0,
- key, event);
+ key, event, conn_id);
}
static GConfValueType
gconf_type = GCONF_VALUE_STRING;
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 (MODEST_CONF_ERROR,
+ MODEST_CONF_ERROR_INVALID_VALUE,
+ "invalid list value type");
}
return gconf_type;
}
+
+void
+modest_conf_listen_to_namespace (ModestConf *self,
+ const gchar *namespace)
+{
+ ModestConfPrivate *priv;
+ GError *error = NULL;
+
+ g_return_if_fail (MODEST_IS_CONF (self));
+ g_return_if_fail (namespace);
+
+ priv = MODEST_CONF_GET_PRIVATE(self);
+
+ /* Add the namespace to the list of the namespaces that will
+ be observed */
+ gconf_client_add_dir (priv->gconf_client,
+ namespace,
+ GCONF_CLIENT_PRELOAD_NONE,
+ &error);
+}
+
+void
+modest_conf_forget_namespace (ModestConf *self,
+ const gchar *namespace)
+{
+ ModestConfPrivate *priv;
+
+ g_return_if_fail (MODEST_IS_CONF (self));
+ g_return_if_fail (namespace);
+
+ priv = MODEST_CONF_GET_PRIVATE(self);
+
+ /* Remove the namespace to the list of the namespaces that will
+ be observed */
+ gconf_client_remove_dir (priv->gconf_client, namespace, NULL);
+}
projects / modest / blobdiff