summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2010-11-23 02:51:59 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2010-11-23 02:51:59 +0800
commit26440eb73a49b339e27398d9c8f151a53f490106 (patch)
tree097d4637414b1ebcee1e27ef94e7b337c2547508
parentdd1abd3bc425c2f65cce23a868043ca10ae177a2 (diff)
downloadcompizconfig-backend-gsettings-26440eb73a49b339e27398d9c8f151a53f490106.tar.gz
compizconfig-backend-gsettings-26440eb73a49b339e27398d9c8f151a53f490106.tar.bz2
Change paths so that old and new settings don't conflict
-rw-r--r--src/gconf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gconf.c b/src/gconf.c
index 00e0ce2..400ce18 100644
--- a/src/gconf.c
+++ b/src/gconf.c
@@ -51,8 +51,8 @@
#define CompScrollLockMask (1 << 22)
#define METACITY "/apps/metacity"
-#define COMPIZ "/apps/compiz"
-#define COMPIZCONFIG "/apps/compizconfig"
+#define COMPIZ "/apps/compiz-1"
+#define COMPIZCONFIG "/apps/compizconfig-1"
#define PROFILEPATH COMPIZCONFIG "/profiles"
#define DEFAULTPROF "Default"
#define CORE_NAME "core"
@@ -1883,7 +1883,7 @@ checkProfile (CCSContext *context)
if (lastProfile)
{
- /* copy /apps/compiz tree to profile path */
+ /* copy /apps/compiz-1 tree to profile path */
asprintf (&pathName, "%s/%s", PROFILEPATH, lastProfile);
if (pathName)
{
@@ -1893,16 +1893,16 @@ checkProfile (CCSContext *context)
}
}
- /* reset /apps/compiz tree */
+ /* reset /apps/compiz-1 tree */
gconf_client_recursive_unset (client, COMPIZ, 0, NULL);
- /* copy new profile tree to /apps/compiz */
+ /* copy new profile tree to /apps/compiz-1 */
asprintf (&pathName, "%s/%s", PROFILEPATH, currentProfile);
if (pathName)
{
copyGconfTree (context, pathName, COMPIZ, FALSE, NULL);
- /* delete the new profile tree in /apps/compizconfig
+ /* delete the new profile tree in /apps/compiz-1config
to avoid user modification in the wrong tree */
copyGconfTree (context, pathName, NULL, TRUE, NULL);
free (pathName);