VERSION | 2 +- settings-backend/gconf.c | 29 ++++++++++++++++------------- 2 files changed, 17 insertions(+), 14 deletions(-)
New commits: commit 92d910aa088dd6f42f39eec5c804b141a2d5e5e9 Author: Guillaume Seguin <[email protected]> Date: Wed Oct 14 04:09:09 2009 +0200 * Bump version to 0.8.4 diff --git a/VERSION b/VERSION index 9b265c0..e4184f4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.8.3 +VERSION=0.8.4 commit 5d392b4c1f4e216656369ab2bd5ef783f60e9d86 Author: Erkin Bahceci <[email protected]> Date: Fri Sep 25 11:07:54 2009 -0500 Sync metacity with staticswitcher instead of switcher. diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c index 7cca9b3..e94d825 100644 --- a/settings-backend/gconf.c +++ b/settings-backend/gconf.c @@ -172,9 +172,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, commit c08a69a7e917209d88bc45e2c82c1a4a40d1969a Author: Erkin Bahceci <[email protected]> Date: Thu Sep 24 19:04:00 2009 -0500 Fix crash (LP: #407020). diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c index 6a1d30a..7cca9b3 100644 --- a/settings-backend/gconf.c +++ b/settings-backend/gconf.c @@ -1834,17 +1834,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 */ commit 7d8ba7d820e43af40e2b8407fbb5606ff10c501f Author: Danny Baumann <[email protected]> Date: Wed Apr 8 20:31:08 2009 +0200 Fix warning. diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c index cce63b1..6a1d30a 100644 --- a/settings-backend/gconf.c +++ b/settings-backend/gconf.c @@ -406,7 +406,7 @@ isIntegratedOption (CCSSetting *setting, for (i = 0; i < N_SOPTIONS; i++) { - SpecialOption *opt = &specialOptions[i]; + const SpecialOption *opt = &specialOptions[i]; if (strcmp (setting->name, opt->settingName) != 0) continue; commit f67aaea7e1161b221423d6015c38e6d7dd0af32d Author: Danny Baumann <[email protected]> Date: Wed Apr 8 20:30:16 2009 +0200 Fix setting integration for screenshot and terminal commands. diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c index 8d104b3..cce63b1 100644 --- a/settings-backend/gconf.c +++ b/settings-backend/gconf.c @@ -351,11 +351,11 @@ const SpecialOption specialOptions[] = { {"rotate_right_window_key", "rotate", FALSE, METACITY "/window_keybindings/move_to_workspace_right", OptionKey}, - {"command_screenshot", "core", FALSE, + {"command_screenshot", "gnomecompat", FALSE, METACITY "/keybinding_commands/command_screenshot", OptionString}, - {"command_window_screenshot", "core", FALSE, + {"command_window_screenshot", "gnomecompat", FALSE, METACITY "/keybinding_commands/command_window_screenshot", OptionString}, - {"command_terminal", "core", FALSE, + {"command_terminal", "gnomecompat", FALSE, "/desktop/gnome/applications/terminal/exec", OptionString}, {"current_viewport", "thumbnail", TRUE, commit 62a307f19702e08a99d6d95ba0b683d6b0b06dc7 Author: Guillaume Seguin <[email protected]> Date: Mon Mar 9 15:43:49 2009 +0100 * Bump version to 0.8.3 diff --git a/VERSION b/VERSION index 2dcc312..9b265c0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.8.2 +VERSION=0.8.3 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
