summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-07-10 18:06:35 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-07-10 18:06:35 +0800
commitc44e0d994c867b36ce526999399f797c14ddf521 (patch)
tree256b031843437fece4863d06527d4ea938785e55
parent72bb9129806fe80cb52b1fe28df692185658b0f6 (diff)
downloadcompizconfig-backend-gsettings-c44e0d994c867b36ce526999399f797c14ddf521.tar.gz
compizconfig-backend-gsettings-c44e0d994c867b36ce526999399f797c14ddf521.tar.bz2
Start the transition to GSettings, use the gconf backend for now
-rw-r--r--CMakeLists.txt8
-rw-r--r--src/gsettings.c (renamed from src/gconf.c)8
2 files changed, 9 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index caee4b8..bf709ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,11 @@
-project (compizconfig-backend-gconf)
+project (compizconfig-backend-gsettings)
find_package (CompizConfig REQUIRED)
include (LibCompizConfigCommon)
-compizconfig_backend (gconf PKGDEPS glib-2.0 gconf-2.0)
+compizconfig_backend (gsettings PKGDEPS glib-2.0>=2.20.0 gconf-2.0>=2.31.1 gio-2.0>=2.25.0)
-compiz_print_configure_header ("CompizConfig GConf Storage Backend")
+compiz_print_configure_header ("CompizConfig GSettings Storage Backend")
compiz_print_configure_footer ()
-compiz_package_generation ("CompizConfig GConf Storage Backend")
+compiz_package_generation ("CompizConfig GSettings Storage Backend")
diff --git a/src/gconf.c b/src/gsettings.c
index fbdcebb..7d595a5 100644
--- a/src/gconf.c
+++ b/src/gsettings.c
@@ -1927,6 +1927,8 @@ initBackend (CCSContext * context)
{
g_type_init ();
+ g_setenv ("GSETTINGS_BACKEND", "gconf", FALSE);
+
conf = gconf_engine_get_default ();
initClient (context);
@@ -2080,9 +2082,9 @@ deleteProfile (CCSContext *context,
}
static CCSBackendVTable gconfVTable = {
- "gconf",
- "GConf Configuration Backend",
- "GConf Configuration Backend for libccs",
+ "gsettings",
+ "GSettings Configuration Backend",
+ "GSettings Configuration Backend for libccs",
TRUE,
TRUE,
processEvents,