diff options
| author | Thomas Thurman <tthurman@gnome.org> | 2008-10-26 17:25:42 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-10-26 17:25:42 +0000 |
| commit | d819b99d99961d8e952e2b1d59ea27e0c97d3baa (patch) | |
| tree | 92b132e4612a33b11854fb6373e1759a22903205 | |
| parent | 8201b0361a8127111945ee96e50bfbd29d6410b6 (diff) | |
| download | metacity-d819b99d99961d8e952e2b1d59ea27e0c97d3baa.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/core/prefs.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -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> * doc/creating_themes/C/creating-metacity-themes.xml: added missing @id diff --git a/src/core/prefs.c b/src/core/prefs.c index ab82c988..267eb47b 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -1381,7 +1381,7 @@ mouse_button_mods_handler (MetaPreference pref, meta_topic (META_DEBUG_KEYBINDINGS, "Mouse button modifier has new gconf value \"%s\"\n", string_value); - if (meta_ui_parse_modifier (string_value, &mods)) + if (string_value && meta_ui_parse_modifier (string_value, &mods)) { mouse_button_mods = mods; } |