aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2011-11-17 23:04:11 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-11-17 23:04:11 +0800
commit4efe4a85d96b9f0c330beb5489c8924f67cdca9f (patch)
treecf0a5fd520d6bc90c471dfd8536714b44b91ac15 /addressbook
parent900d019a0332b24d2bee7ea1407b149fca2c0598 (diff)
downloadgsoc2013-evolution-4efe4a85d96b9f0c330beb5489c8924f67cdca9f.tar
gsoc2013-evolution-4efe4a85d96b9f0c330beb5489c8924f67cdca9f.tar.gz
gsoc2013-evolution-4efe4a85d96b9f0c330beb5489c8924f67cdca9f.tar.bz2
gsoc2013-evolution-4efe4a85d96b9f0c330beb5489c8924f67cdca9f.tar.lz
gsoc2013-evolution-4efe4a85d96b9f0c330beb5489c8924f67cdca9f.tar.xz
gsoc2013-evolution-4efe4a85d96b9f0c330beb5489c8924f67cdca9f.tar.zst
gsoc2013-evolution-4efe4a85d96b9f0c330beb5489c8924f67cdca9f.zip
Migrate all EABConfig* code to use GSettings
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/gui/widgets/eab-config.c12
-rw-r--r--addressbook/gui/widgets/eab-config.h5
2 files changed, 8 insertions, 9 deletions
diff --git a/addressbook/gui/widgets/eab-config.c b/addressbook/gui/widgets/eab-config.c
index e1a0501203..6974df22d1 100644
--- a/addressbook/gui/widgets/eab-config.c
+++ b/addressbook/gui/widgets/eab-config.c
@@ -70,8 +70,8 @@ ecp_target_free (EConfig *ec,
case EAB_CONFIG_TARGET_PREFS: {
EABConfigTargetPrefs *s = (EABConfigTargetPrefs *) t;
- if (s->gconf)
- g_object_unref (s->gconf);
+ if (s->settings)
+ g_object_unref (s->settings);
break; }
}
@@ -163,15 +163,15 @@ eab_config_target_new_source (EABConfig *ecp,
EABConfigTargetPrefs *
eab_config_target_new_prefs (EABConfig *ecp,
- GConfClient *gconf)
+ GSettings *settings)
{
EABConfigTargetPrefs *t = e_config_target_new (
&ecp->config, EAB_CONFIG_TARGET_PREFS, sizeof (*t));
- if (gconf)
- t->gconf = g_object_ref (gconf);
+ if (settings)
+ t->settings = g_object_ref (settings);
else
- t->gconf = NULL;
+ t->settings = NULL;
return t;
}
diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h
index 70023360e0..ee99f64626 100644
--- a/addressbook/gui/widgets/eab-config.h
+++ b/addressbook/gui/widgets/eab-config.h
@@ -24,7 +24,6 @@
#ifndef __EAB_CONFIG_H__
#define __EAB_CONFIG_H__
-#include <gconf/gconf-client.h>
#include <libedataserver/e-source.h>
#include "e-util/e-config.h"
@@ -65,8 +64,8 @@ typedef struct _EABConfigTargetPrefs EABConfigTargetPrefs;
struct _EABConfigTargetPrefs {
EConfigTarget target;
- /* preferences are global from gconf */
- GConfClient *gconf;
+ /* preferences are global from GSettings */
+ GSettings *settings;
};
typedef struct _EConfigItem EABConfigItem;