Ignore values of .../mouse_button_modifier key if the key's missing.

2008-10-26  Thomas Thurman  <tthurman@gnome.org>

        * src/core/prefs.c (mouse_button_mods_handler): Ignore values
          of .../mouse_button_modifier key if the key's missing.
          Closes Launchpad bug #258054, Launchpad bug #266929.


svn path=/trunk/; revision=4001
This commit is contained in:
Thomas Thurman 2008-10-26 17:25:42 +00:00 committed by Thomas James Alexander Thurman
parent 8201b0361a
commit d819b99d99
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2008-10-26 Thomas Thurman <tthurman@gnome.org>
* src/core/prefs.c (mouse_button_mods_handler): Ignore values
of .../mouse_button_modifier key if the key's missing.
Closes Launchpad bug #258054, Launchpad bug #266929.
2008-10-23 Frederic Peters <fpeters@0d.be> 2008-10-23 Frederic Peters <fpeters@0d.be>
* doc/creating_themes/C/creating-metacity-themes.xml: added missing @id * doc/creating_themes/C/creating-metacity-themes.xml: added missing @id

View File

@ -1381,7 +1381,7 @@ mouse_button_mods_handler (MetaPreference pref,
meta_topic (META_DEBUG_KEYBINDINGS, meta_topic (META_DEBUG_KEYBINDINGS,
"Mouse button modifier has new gconf value \"%s\"\n", "Mouse button modifier has new gconf value \"%s\"\n",
string_value); string_value);
if (meta_ui_parse_modifier (string_value, &mods)) if (string_value && meta_ui_parse_modifier (string_value, &mods))
{ {
mouse_button_mods = mods; mouse_button_mods = mods;
} }