summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-07-15 04:48:26 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-07-15 04:48:26 +0800
commit9b62f151f3634eacc98d9c4976db17b1780ac68d (patch)
treed900371385447a72db0efec4215e09881cf8a2f2
parenta836f65b81f318da73866724cf0eb0b8ecb8bdf2 (diff)
downloadcompizconfig-backend-gsettings-9b62f151f3634eacc98d9c4976db17b1780ac68d.tar.gz
compizconfig-backend-gsettings-9b62f151f3634eacc98d9c4976db17b1780ac68d.tar.bz2
Remove GConfEngine usage as we're not copying keys around anymore
-rw-r--r--src/gsettings.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gsettings.c b/src/gsettings.c
index 82d9ebb..94d8e99 100644
--- a/src/gsettings.c
+++ b/src/gsettings.c
@@ -86,7 +86,6 @@ static GList *settings_list = NULL;
static GSettings *compizconfig_settings = NULL;
static GSettings *current_profile_settings = NULL;
static GList *watched_gnome_settings;
-static GConfEngine *conf = NULL;
static guint gnomeGConfNotifyIds[NUM_WATCHED_DIRS];
static char *currentProfile = NULL;
@@ -791,7 +790,7 @@ initGConfClient (CCSContext *context)
{
int i;
- client = gconf_client_get_for_engine (conf);
+ client = gconf_client_get_default ();
for (i = 0; i < NUM_WATCHED_DIRS; i++)
{
@@ -2051,7 +2050,6 @@ initBackend (CCSContext * context)
compizconfig_settings = g_settings_new ("org.freedesktop.compizconfig");
- conf = gconf_engine_get_default ();
initGConfClient (context);
currentProfile = getCurrentProfileName ();
@@ -2079,9 +2077,6 @@ finiBackend (CCSContext * context)
currentProfile = NULL;
}
- gconf_engine_unref (conf);
- conf = NULL;
-
while (l)
{
g_object_unref (G_OBJECT (l->data));