diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/core/prefs.c | 2 |
2 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2008-02-17 Jim Huang <jserv.tw@gmail.com> + + * src/core/prefs.c (update_binding): Allow compilation + when gconf mode is disabled. Closes #515019. + 2008-02-14 Jim Huang <jserv.tw@gmail.com> * src/core/display.c, src/core/util.c: fixups to allow diff --git a/src/core/prefs.c b/src/core/prefs.c index 46d05b9..cbc639b 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -2290,6 +2290,7 @@ update_binding (MetaKeyPref *binding, combo = binding->bindings->data; +#ifdef HAVE_GCONF /* Bug 329676: Bindings which can be shifted must not have no modifiers, * nor only SHIFT as a modifier. */ @@ -2349,6 +2350,7 @@ update_binding (MetaKeyPref *binding, */ return TRUE; } +#endif changed = FALSE; if (keysym != combo->keysym || |