metacity r3741 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Wed May 28 04:10:08 2008
New Revision: 3741
URL: http://svn.gnome.org/viewvc/metacity?rev=3741&view=rev

Log:
2008-05-28  Thomas Thurman  <tthurman gnome org>

        * src/core/prefs.c (handle_preference_update_string,
        meta_prefs_remove_listener, queue_changed): Make disabling
        gconf work again.  Closes #530870.



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	Wed May 28 04:10:08 2008
@@ -689,10 +689,6 @@
   return TRUE;
 }
 
-#endif /* HAVE_GCONF */
-
-/* FIXME: Ultimately these should be no-ops if !HAVE_GCONF. */
-
 void
 meta_prefs_add_listener (MetaPrefsChangedFunc func,
                          gpointer             data)
@@ -732,7 +728,6 @@
   meta_bug ("Did not find listener to remove\n");
 }
 
-#ifdef HAVE_GCONF
 static void
 emit_changed (MetaPreference pref)
 {
@@ -803,8 +798,26 @@
     changed_idle = g_idle_add_full (META_PRIORITY_PREFS_NOTIFY,
                                     changed_idle_handler, NULL, NULL);
 }
+
+#else /* HAVE_GCONF */
+
+void
+meta_prefs_add_listener (MetaPrefsChangedFunc func,
+                         gpointer             data)
+{
+  /* Nothing, because they have gconf turned off */
+}
+
+void
+meta_prefs_remove_listener (MetaPrefsChangedFunc func,
+                            gpointer             data)
+{
+  /* Nothing, because they have gconf turned off */
+}
+
 #endif /* HAVE_GCONF */
 
+
 static gchar *gconf_dirs_we_are_interested_in[] = {
   "/apps/metacity",
   KEY_TERMINAL_DIR,