diff options
| author | Thomas Thurman <tthurman@gnome.org> | 2008-05-28 04:10:08 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-05-28 04:10:08 +0000 |
| commit | 01c0a951363b6e44db7f0685b20f09c24126754a (patch) | |
| tree | 84f4dfa6c269dd791ced8b0d34bef42cf5bb2fdf | |
| parent | 8fea7a4128c2050f2c7aa0e09537633c74860a49 (diff) | |
| download | metacity-01c0a951363b6e44db7f0685b20f09c24126754a.tar.gz | |
Make disabling gconf work again. Closes #530870.
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.
svn path=/trunk/; revision=3741
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/core/prefs.c | 23 |
2 files changed, 24 insertions, 5 deletions
@@ -1,3 +1,9 @@ +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. + 2008-05-26 Thomas Thurman <tthurman@gnome.org> * configure.in: Post-release bump to 2.23.34. diff --git a/src/core/prefs.c b/src/core/prefs.c index 7a1473f9..025d2460 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -689,10 +689,6 @@ handle_preference_update_string (const gchar *key, GConfValue *value) 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_prefs_remove_listener (MetaPrefsChangedFunc func, meta_bug ("Did not find listener to remove\n"); } -#ifdef HAVE_GCONF static void emit_changed (MetaPreference pref) { @@ -803,8 +798,26 @@ queue_changed (MetaPreference pref) 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, |