metacity r4001 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Sun Oct 26 17:25:42 2008
New Revision: 4001
URL: http://svn.gnome.org/viewvc/metacity?rev=4001&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/src/core/prefs.c

Modified: trunk/src/core/prefs.c
==============================================================================
--- trunk/src/core/prefs.c	(original)
+++ trunk/src/core/prefs.c	Sun Oct 26 17:25:42 2008
@@ -1381,7 +1381,7 @@
   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;
     }