metacity r3573 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Sun Feb 17 22:43:28 2008
New Revision: 3573
URL: http://svn.gnome.org/viewvc/metacity?rev=3573&view=rev

Log:
2008-02-17  Jim Huang  <jserv tw gmail com>

        * src/core/prefs.c (update_binding): Allow compilation
	when gconf mode is disabled. Closes #515019.



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	Sun Feb 17 22:43:28 2008
@@ -2290,6 +2290,7 @@
   
    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 @@
        */
       return TRUE;
     }
+#endif
   
   changed = FALSE;
   if (keysym != combo->keysym ||