compizconfig-backend-gconf: Changes to 'upstream-unstable'
VERSION | 2
settings-backend/gconf.c | 136 ++++++++++++++++++++++++++---------------------
2 files changed, 78 insertions(+), 60 deletions(-)
New commits:
commit b5699e6559d09a1b27314db42682c03faee206f5
Author: Guillaume Seguin <guillaume@segu.in>
Date: Mon Mar 9 15:43:49 2009 +0100
* Bump version to 0.8.2
diff --git a/VERSION b/VERSION
index 1357b31..2dcc312 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.9
+VERSION=0.8.2
commit ad3a92b4ae2aa1fd8717cb8798addda661661d06
Author: Danny Baumann <dannybaumann@web.de>
Date: Thu Feb 5 08:27:42 2009 +0100
Track option movements.
diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 9b72c91..8d104b3 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -115,15 +115,15 @@ typedef struct _SpecialOption {
} SpecialOption;
const SpecialOption specialOptions[] = {
- {"run_key", "core", FALSE,
+ {"run_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/panel_run_dialog", OptionKey},
- {"main_menu_key", "core", FALSE,
+ {"main_menu_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/panel_main_menu", OptionKey},
- {"run_command_screenshot_key", "core", FALSE,
+ {"run_command_screenshot_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/run_command_screenshot", OptionKey},
- {"run_command_window_screenshot_key", "core", FALSE,
+ {"run_command_window_screenshot_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/run_command_window_screenshot", OptionKey},
- {"run_command_terminal_key", "core", FALSE,
+ {"run_command_terminal_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/run_command_terminal", OptionKey},
{"toggle_window_maximized_key", "core", FALSE,
@@ -182,54 +182,54 @@ const SpecialOption specialOptions[] = {
{"toggle_fullscreen_key", "extrawm", FALSE,
METACITY "/window_keybindings/toggle_fullscreen", OptionKey},
- {"command0", "core", FALSE,
+ {"command0", "commands", FALSE,
METACITY "/keybinding_commands/command_1", OptionString},
- {"command1", "core", FALSE,
+ {"command1", "commands", FALSE,
METACITY "/keybinding_commands/command_2", OptionString},
- {"command2", "core", FALSE,
+ {"command2", "commands", FALSE,
METACITY "/keybinding_commands/command_3", OptionString},
- {"command3", "core", FALSE,
+ {"command3", "commands", FALSE,
METACITY "/keybinding_commands/command_4", OptionString},
- {"command4", "core", FALSE,
+ {"command4", "commands", FALSE,
METACITY "/keybinding_commands/command_5", OptionString},
- {"command5", "core", FALSE,
+ {"command5", "commands", FALSE,
METACITY "/keybinding_commands/command_6", OptionString},
- {"command6", "core", FALSE,
+ {"command6", "commands", FALSE,
METACITY "/keybinding_commands/command_7", OptionString},
- {"command7", "core", FALSE,
+ {"command7", "commands", FALSE,
METACITY "/keybinding_commands/command_8", OptionString},
- {"command8", "core", FALSE,
+ {"command8", "commands", FALSE,
METACITY "/keybinding_commands/command_9", OptionString},
- {"command9", "core", FALSE,
+ {"command9", "commands", FALSE,
METACITY "/keybinding_commands/command_10", OptionString},
- {"command10", "core", FALSE,
+ {"command10", "commands", FALSE,
METACITY "/keybinding_commands/command_11", OptionString},
- {"command11", "core", FALSE,
+ {"command11", "commands", FALSE,
METACITY "/keybinding_commands/command_12", OptionString},
- {"run_command0_key", "core", FALSE,
+ {"run_command0_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_1", OptionKey},
- {"run_command1_key", "core", FALSE,
+ {"run_command1_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_2", OptionKey},
- {"run_command2_key", "core", FALSE,
+ {"run_command2_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_3", OptionKey},
- {"run_command3_key", "core", FALSE,
+ {"run_command3_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_4", OptionKey},
- {"run_command4_key", "core", FALSE,
+ {"run_command4_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_5", OptionKey},
- {"run_command5_key", "core", FALSE,
+ {"run_command5_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_6", OptionKey},
- {"run_command6_key", "core", FALSE,
+ {"run_command6_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_7", OptionKey},
- {"run_command7_key", "core", FALSE,
+ {"run_command7_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_8", OptionKey},
- {"run_command8_key", "core", FALSE,
+ {"run_command8_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_9", OptionKey},
- {"run_command9_key", "core", FALSE,
+ {"run_command9_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_10", OptionKey},
- {"run_command10_key", "core", FALSE,
+ {"run_command10_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_11", OptionKey},
- {"run_command11_key", "core", FALSE,
+ {"run_command11_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_12", OptionKey},
{"rotate_to_1_key", "rotate", FALSE,
commit f22deacbc9e5239ff2d587cf0a8286f895ffb4e2
Author: Danny Baumann <dannybaumann@web.de>
Date: Wed Jan 14 09:05:22 2009 +0100
Improve readability.
diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 85651e1..9b72c91 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -406,19 +406,35 @@ isIntegratedOption (CCSSetting *setting,
for (i = 0; i < N_SOPTIONS; i++)
{
- if ((strcmp (setting->name, specialOptions[i].settingName) == 0) &&
- ((!setting->parent->name && !specialOptions[i].pluginName) ||
- (setting->parent->name && specialOptions[i].pluginName &&
- (strcmp (setting->parent->name,
- specialOptions[i].pluginName) == 0))) &&
- ((setting->isScreen && specialOptions[i].screen) ||
- (!setting->isScreen && !specialOptions[i].screen)))
+ SpecialOption *opt = &specialOptions[i];
+
+ if (strcmp (setting->name, opt->settingName) != 0)
+ continue;
+
+ if (setting->parent->name)
{
- if (index)
- *index = i;
- return TRUE;
+ if (!opt->pluginName)
+ continue;
+ if (strcmp (setting->parent->name, opt->pluginName) != 0)
+ continue;
}
+ else
+ {
+ if (opt->pluginName)
+ continue;
+ }
+
+ if (setting->isScreen && !opt->screen)
+ continue;
+ if (!setting->isScreen && opt->screen)
+ continue;
+
+ if (index)
+ *index = i;
+
+ return TRUE;
}
+
return FALSE;
}
commit f62a2895ea311bf34ac65ec362738106856f06fb
Author: Danny Baumann <dannybaumann@web.de>
Date: Wed Jan 14 08:21:10 2009 +0100
Don't allow empty modifiers for mouse_button_modifier.
Fixes bug #1106.
diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 198a2ab..85651e1 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -1394,28 +1394,25 @@ writeListValue (CCSSetting *setting,
g_slist_free (valueList);
}
-static void
+static Bool
setGnomeMouseButtonModifier (unsigned int modMask)
{
char *modifiers, *currentValue;
GError *err = NULL;
modifiers = ccsModifiersToString (modMask);
-
if (!modifiers)
- modifiers = strdup ("");
- if (!modifiers)
- return;
+ return FALSE;
- currentValue =
- gconf_client_get_string(client,
- METACITY "/general/mouse_button_modifier",
- &err);
+ currentValue = gconf_client_get_string (client,
+ METACITY
+ "/general/mouse_button_modifier",
+ &err);
if (err)
{
free (modifiers);
g_error_free (err);
- return;
+ return FALSE;
}
if (!currentValue || (strcmp (currentValue, modifiers) != 0))
@@ -1426,6 +1423,8 @@ setGnomeMouseButtonModifier (unsigned int modMask)
g_free (currentValue);
free (modifiers);
+
+ return TRUE;
}
static void
@@ -1598,13 +1597,16 @@ writeIntegratedOption (CCSContext *context,
unsigned int modMask;
modMask = setting->value->value.asButton.buttonModMask;
- setGnomeMouseButtonModifier (modMask);
- setButtonBindingForSetting (context, "move",
- "initiate_button", 1, modMask);
- setButtonBindingForSetting (context, "resize",
- "initiate_button", 2, modMask);
- setButtonBindingForSetting (context, "core",
- "window_menu_button", 3, modMask);
+ if (setGnomeMouseButtonModifier (modMask))
+ {
+ setButtonBindingForSetting (context, "move",
+ "initiate_button", 1, modMask);
+ setButtonBindingForSetting (context, "resize",
+ "initiate_button", 2, modMask);
+ setButtonBindingForSetting (context, "core",
+ "window_menu_button",
+ 3, modMask);
+ }
}
}
break;
commit a71dc917cd72770dda6b0aa3a5869f74bb3410b2
Author: Guillaume Seguin <guillaume@segu.in>
Date: Tue Sep 23 13:34:21 2008 +0200
* Bump version to 0.7.9
diff --git a/VERSION b/VERSION
index 38e4baa..1357b31 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.8
+VERSION=0.7.9
commit b98f3f7ae716040bf6b2459776ed942da86d2eba
Author: Guillaume Seguin <guillaume@segu.in>
Date: Tue Sep 23 13:34:20 2008 +0200
* Bump version to 0.7.8
diff --git a/VERSION b/VERSION
index fce301a..38e4baa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.7
+VERSION=0.7.8
commit 81f3ab9319c39eb1dabc735376c1f6a468580463
Author: Danny Baumann <dannybaumann@web.de>
Date: Wed Jul 16 09:52:41 2008 +0200
Fix saving of float lists.
diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index c13846e..198a2ab 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -1321,10 +1321,10 @@ writeListValue (CCSSetting *setting,
break;
case TypeFloat:
{
- float *item;
+ gdouble *item;
while (list)
{
- item = malloc (sizeof (float));
+ item = malloc (sizeof (gdouble));
if (item)
{
*item = list->data->value.asFloat;
commit 43841c4d72e591de299849e9aff4412113009796
Author: Danny Baumann <dannybaumann@web.de>
Date: Wed Jun 11 07:43:32 2008 +0200
Compiz' click_to_focus disabled is the equivalent of Metacity's sloppy focus mode.
diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index cf9ca9b..c13846e 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -1577,7 +1577,7 @@ writeIntegratedOption (CCSContext *context,
if (!ccsGetBool (setting, &clickToFocus))
break;
- newValue = clickToFocus ? "click" : "mouse";
+ newValue = clickToFocus ? "click" : "sloppy";
currentValue = gconf_client_get_string (client,
optionName, &err);
commit 69447010c61ce782e2630820677946e6870c7470
Author: Guillaume Seguin <guillaume@segu.in>
Date: Sat May 31 14:08:56 2008 +0200
* Bump version to 0.7.7
diff --git a/VERSION b/VERSION
index 6410fd5..fce301a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.6
+VERSION=0.7.7
Reply to: