diff options
| author | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-11-22 19:34:03 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-11-22 19:34:03 +0000 |
| commit | c2abbce2edf734dad95aefe5e891d21ae4d10527 (patch) | |
| tree | b581f442ef555eb2f663b668a66ab506d278c527 | |
| parent | 38cd6a6c1fd9646e64d46d86d58d95621d8579ad (diff) | |
| download | metacity-c2abbce2edf734dad95aefe5e891d21ae4d10527.tar.gz | |
fix stupid infinite loop when GConf is turned off.
* src/core/prefs.c: fix stupid infinite loop when GConf is turned off.
svn path=/trunk/; revision=4024
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/core/prefs.c | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -1,5 +1,9 @@ 2008-11-22 Thomas Thurman <tthurman@gnome.org> + * src/core/prefs.c: fix stupid infinite loop when GConf is turned off. + +2008-11-22 Thomas Thurman <tthurman@gnome.org> + * src/core/prefs.c: fix two places where there was a warning if GConf was turned off. diff --git a/src/core/prefs.c b/src/core/prefs.c index d0fb1c9c..ca928e9e 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -1875,8 +1875,10 @@ init_bindings (void) 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) |