← Back to branch summary

~compiz-team/compiz-compizconfig-gconf/compiz-compizconfig-gconf.settings_upgrades

« back to all changes in this revision

Viewing changes to src/gconf.c

  • Committer: Sam Spilsbury
  • Date: 2010-11-22 18:51:59 UTC
  • Revision ID: git-v1:26440eb73a49b339e27398d9c8f151a53f490106
Change paths so that old and new settings don't conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gconf.c
51
51
#define CompScrollLockMask (1 << 22)
52
52
 
53
53
#define METACITY     "/apps/metacity"
54
 
#define COMPIZ       "/apps/compiz"
55
 
#define COMPIZCONFIG "/apps/compizconfig"
 
54
#define COMPIZ       "/apps/compiz-1"
 
55
#define COMPIZCONFIG "/apps/compizconfig-1"
56
56
#define PROFILEPATH  COMPIZCONFIG "/profiles"
57
57
#define DEFAULTPROF "Default"
58
58
#define CORE_NAME   "core"
1883
1883
 
1884
1884
        if (lastProfile)
1885
1885
        {
1886
 
            /* copy /apps/compiz tree to profile path */
 
1886
            /* copy /apps/compiz-1 tree to profile path */
1887
1887
            asprintf (&pathName, "%s/%s", PROFILEPATH, lastProfile);
1888
1888
            if (pathName)
1889
1889
            {
1893
1893
            }
1894
1894
        }
1895
1895
 
1896
 
        /* reset /apps/compiz tree */
 
1896
        /* reset /apps/compiz-1 tree */
1897
1897
        gconf_client_recursive_unset (client, COMPIZ, 0, NULL);
1898
1898
 
1899
 
        /* copy new profile tree to /apps/compiz */
 
1899
        /* copy new profile tree to /apps/compiz-1 */
1900
1900
        asprintf (&pathName, "%s/%s", PROFILEPATH, currentProfile);
1901
1901
        if (pathName)
1902
1902
        {
1903
1903
            copyGconfTree (context, pathName, COMPIZ, FALSE, NULL);
1904
1904
 
1905
 
            /* delete the new profile tree in /apps/compizconfig
 
1905
            /* delete the new profile tree in /apps/compiz-1config
1906
1906
               to avoid user modification in the wrong tree */
1907
1907
            copyGconfTree (context, pathName, NULL, TRUE, NULL);
1908
1908
            free (pathName);