summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Huang <jserv.tw@gmail.com>2008-02-17 22:43:28 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-02-17 22:43:28 +0000
commitc35fd86b3ba9c09403c8fdb72fa8ddc065e38c3a (patch)
treeef0fdd91fee08ced42c4c473b20850a659d29c12
parent932fd0dcff9073813d5ae4d2ff63f41bff58fed9 (diff)
downloadmetacity-c35fd86b3ba9c09403c8fdb72fa8ddc065e38c3a.tar.gz
metacity-c35fd86b3ba9c09403c8fdb72fa8ddc065e38c3a.tar.bz2
Allow compilation when gconf mode is disabled. Closes #515019.
2008-02-17 Jim Huang <jserv.tw@gmail.com> * src/core/prefs.c (update_binding): Allow compilation when gconf mode is disabled. Closes #515019. svn path=/trunk/; revision=3573
-rw-r--r--ChangeLog5
-rw-r--r--src/core/prefs.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 24414df..9c900bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 ||