From c35fd86b3ba9c09403c8fdb72fa8ddc065e38c3a Mon Sep 17 00:00:00 2001 From: Jim Huang Date: Sun, 17 Feb 2008 22:43:28 +0000 Subject: [PATCH] Allow compilation when gconf mode is disabled. Closes #515019. 2008-02-17 Jim Huang * src/core/prefs.c (update_binding): Allow compilation when gconf mode is disabled. Closes #515019. svn path=/trunk/; revision=3573 --- ChangeLog | 5 +++++ src/core/prefs.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 24414df95..9c900bc3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-02-17 Jim Huang + + * src/core/prefs.c (update_binding): Allow compilation + when gconf mode is disabled. Closes #515019. + 2008-02-14 Jim Huang * src/core/display.c, src/core/util.c: fixups to allow diff --git a/src/core/prefs.c b/src/core/prefs.c index 46d05b925..cbc639b18 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 ||