summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2010-05-03 18:13:28 +0200
committerDanny Baumann <dannybaumann@web.de>2010-05-03 18:13:28 +0200
commit350e4d5329a103326feb844a48e02376700b15c5 (patch)
treea37582a9c0d3b8a3a4b179be72201ed440289812
parent74c3fd404f0879b5d36c1167d0b43986d949fad4 (diff)
parent091f2d0c4998a97dfff109781ce132a4a8e26dc8 (diff)
downloadcompizconfig-backend-gsettings-350e4d5329a103326feb844a48e02376700b15c5.tar.gz
compizconfig-backend-gsettings-350e4d5329a103326feb844a48e02376700b15c5.tar.bz2
Merge branch 'master' of git+ssh://git.compiz.org/git/fusion/compizconfig/compizconfig-backend-gconf
-rw-r--r--VERSION2
-rw-r--r--settings-backend/gconf.c21
2 files changed, 13 insertions, 10 deletions
diff --git a/VERSION b/VERSION
index 9b265c0..bc600a0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.3
+VERSION=0.8.5
diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 48480e4..5903175 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -175,9 +175,9 @@ const SpecialOption specialOptions[] = {
{"fullscreen_visual_bell", "fade", TRUE,
METACITY "/general/visual_bell_type", OptionSpecial},
- {"next_key", "switcher", FALSE,
+ {"next_key", "staticswitcher", FALSE,
METACITY "/global_keybindings/switch_windows", OptionKey},
- {"prev_key", "switcher", FALSE,
+ {"prev_key", "staticswitcher", FALSE,
METACITY "/global_keybindings/switch_windows_backward", OptionKey},
{"toggle_sticky_key", "extrawm", FALSE,
@@ -1892,17 +1892,20 @@ checkProfile (CCSContext *context)
else
currentProfile = strdup (profile);
- if (strcmp (lastProfile, currentProfile) != 0)
+ if (!lastProfile || strcmp (lastProfile, currentProfile) != 0)
{
char *pathName;
- /* copy /apps/compiz tree to profile path */
- asprintf (&pathName, "%s/%s", PROFILEPATH, lastProfile);
- if (pathName)
+ if (lastProfile)
{
- copyGconfTree (context, COMPIZ, pathName,
- TRUE, "/schemas" COMPIZ);
- free (pathName);
+ /* copy /apps/compiz tree to profile path */
+ asprintf (&pathName, "%s/%s", PROFILEPATH, lastProfile);
+ if (pathName)
+ {
+ copyGconfTree (context, COMPIZ, pathName,
+ TRUE, "/schemas" COMPIZ);
+ free (pathName);
+ }
}
/* reset /apps/compiz tree */