metacity r4024 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Sat Nov 22 19:34:03 2008
New Revision: 4024
URL: http://svn.gnome.org/viewvc/metacity?rev=4024&view=rev

Log:
	* src/core/prefs.c: fix stupid infinite loop when GConf is turned off.



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	Sat Nov 22 19:34:03 2008
@@ -1875,8 +1875,10 @@
   int which = 0;
   while (key_string_bindings[i].name)
     {
-      if (key_string_bindings[i].keybinding == NULL)
+      if (key_string_bindings[i].keybinding == NULL) {
+        ++i;
         continue;
+      }
     
       while (strcmp(key_bindings[which].name, 
                     key_string_bindings[i].name) != 0)