sizeof(ModestConf),
1, /* n_preallocs */
(GInstanceInitFunc) modest_conf_init,
+ NULL
};
my_type = g_type_register_static (G_TYPE_OBJECT,
"ModestConf",
g_object_unref (priv->gconf_client);
priv->gconf_client = NULL;
}
+
+ G_OBJECT_CLASS(parent_class)->finalize (obj);
}
ModestConf*
modest_conf_new (void)
{
- ModestConf *conf = MODEST_CONF(g_object_new(MODEST_TYPE_CONF, NULL));
+ ModestConf *conf;
+ ModestConfPrivate *priv;
+
+ conf = MODEST_CONF(g_object_new(MODEST_TYPE_CONF, NULL));
if (!conf) {
g_printerr ("modest: failed to init ModestConf (GConf)\n");
return NULL;
}
- ModestConfPrivate *priv = MODEST_CONF_GET_PRIVATE(conf);
+ priv = MODEST_CONF_GET_PRIVATE(conf);
if (!priv->gconf_client) {
g_printerr ("modest: failed to init gconf\n");
g_object_unref (conf);
}
+GSList *
+modest_conf_get_list (ModestConf* self, const gchar* key, ModestConfValueType list_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);
+
+ 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);
+}
+
+
+
+
gboolean
modest_conf_set_string (ModestConf* self, const gchar* key, const gchar* val,
GError **err)
modest_conf_remove_key (ModestConf* self, const gchar* key, GError **err)
{
ModestConfPrivate *priv;
-
+ gboolean retval;
+
g_return_val_if_fail (self,FALSE);
g_return_val_if_fail (key, FALSE);
priv = MODEST_CONF_GET_PRIVATE(self);
- return gconf_client_recursive_unset (priv->gconf_client,key,0,err);
-}
-
+ retval = gconf_client_recursive_unset (priv->gconf_client,key,0,err);
+ gconf_client_suggest_sync (priv->gconf_client, NULL);
+ return retval;
+}
gboolean
modest_conf_key_exists (ModestConf* self, const gchar* key, GError **err)
{
ModestConfPrivate *priv;
-
+ GConfValue *val;
+
g_return_val_if_fail (self,FALSE);
g_return_val_if_fail (key, FALSE);
priv = MODEST_CONF_GET_PRIVATE(self);
-
- return gconf_client_dir_exists (priv->gconf_client,key,err);
+
+ /* the fast way... */
+ if (gconf_client_dir_exists (priv->gconf_client,key,err))
+ return TRUE;
+
+ val = gconf_client_get (priv->gconf_client, key, NULL);
+ if (!val)
+ return FALSE;
+ else {
+ gconf_value_free (val);
+ return TRUE;
+ }
}
gchar*
-modest_conf_key_escape (ModestConf *self, const gchar* key)
+modest_conf_key_escape (const gchar* key)
{
g_return_val_if_fail (key, NULL);
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);
+}
+
+
static void
signals[KEY_CHANGED_SIGNAL], 0,
key, event);
}
+