summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2010-12-10 21:52:54 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2010-12-10 21:52:54 +0800
commit62cec93a771d7f74e5d9225862db197ec06b5e12 (patch)
tree8940613bc150687b31c01ee3b034c3b4920ab611
parent9e2664b3c1544f23d7db21c99bd11287fca20b35 (diff)
parent55a267f14038b2507abb743de432ccbfd729a4bb (diff)
downloadcompizconfig-backend-gsettings-62cec93a771d7f74e5d9225862db197ec06b5e12.tar.gz
compizconfig-backend-gsettings-62cec93a771d7f74e5d9225862db197ec06b5e12.tar.bz2
Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/compizconfig/compizconfig-backend-gconf
-rw-r--r--src/gconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gconf.c b/src/gconf.c
index 06d1e9f..fbdcebb 100644
--- a/src/gconf.c
+++ b/src/gconf.c
@@ -1824,7 +1824,7 @@ updateCurrentProfileName (char *profile)
gconf_schema_set_locale (schema, "C");
gconf_schema_set_short_desc (schema, "Current profile");
gconf_schema_set_long_desc (schema, "Current profile of gconf backend");
- gconf_schema_set_owner (schema, "compizconfig");
+ gconf_schema_set_owner (schema, "compizconfig-1");
gconf_value_set_string (value, profile);
gconf_schema_set_default_value (schema, value);
@@ -1897,7 +1897,7 @@ checkProfile (CCSContext *context)
{
copyGconfTree (context, pathName, COMPIZ, FALSE, NULL);
- /* delete the new profile tree in /apps/compiz-1config
+ /* delete the new profile tree in /apps/compizconfig-1
to avoid user modification in the wrong tree */
copyGconfTree (context, pathName, NULL, TRUE, NULL);
free (pathName);