summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2010-12-10 21:52:17 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2010-12-10 21:52:17 +0800
commit9e2664b3c1544f23d7db21c99bd11287fca20b35 (patch)
treeeba52d4bf713f0c7e1f234262244ff5a8dc6708f
parentb40d06f3023a031a1a32ecc0d3d5644a91b83f36 (diff)
downloadcompizconfig-backend-gsettings-9e2664b3c1544f23d7db21c99bd11287fca20b35.tar.gz
compizconfig-backend-gsettings-9e2664b3c1544f23d7db21c99bd11287fca20b35.tar.bz2
Add multiscreen support
-rw-r--r--src/gconf.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/gconf.c b/src/gconf.c
index 4cb7aaa..06d1e9f 100644
--- a/src/gconf.c
+++ b/src/gconf.c
@@ -57,11 +57,6 @@
#define DEFAULTPROF "Default"
#define CORE_NAME "core"
-/* HACK: Really we should support multiple screens, but this would
- * require some work elsewhere so lets leave it at zero for now */
-
-#define DEFAULT_SCREEN_NUM 0
-
#define BUFSIZE 512
#define KEYNAME(sn) char keyName[BUFSIZE]; \
@@ -1136,7 +1131,7 @@ readOption (CCSSetting * setting)
Bool ret = FALSE;
Bool valid = TRUE;
- KEYNAME(DEFAULT_SCREEN_NUM);
+ KEYNAME(setting->parent->context->screenNum);
PATHNAME;
/* first check if the key is set */
@@ -1678,7 +1673,7 @@ writeIntegratedOption (CCSContext *context,
static void
resetOptionToDefault (CCSSetting * setting)
{
- KEYNAME (DEFAULT_SCREEN_NUM);
+ KEYNAME (setting->parent->context->screenNum);
PATHNAME;
gconf_client_recursive_unset (client, pathName, 0, NULL);
@@ -1688,7 +1683,7 @@ resetOptionToDefault (CCSSetting * setting)
static void
writeOption (CCSSetting * setting)
{
- KEYNAME (DEFAULT_SCREEN_NUM);
+ KEYNAME (setting->parent->context->screenNum);
PATHNAME;
switch (setting->type)