brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make disabling gconf work again. Closes #530870.

Browse Source 
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
This commit is contained in:
Thomas Thurman 2008-05-28 04:10:08 +00:00 committed by Thomas James Alexander Thurman
parent 8fea7a4128
commit 01c0a95136
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2008-05-26 Thomas Thurman <tthurman@gnome.org>
* configure.in: Post-release bump to 2.23.34. * configure.in: Post-release bump to 2.23.34.

23
src/core/prefs.c
View File

@ -689,10 +689,6 @@ handle_preference_update_string (const gchar *key, GConfValue *value)
return TRUE; return TRUE;
} }
#endif /* HAVE_GCONF */
/* FIXME: Ultimately these should be no-ops if !HAVE_GCONF. */
void void
meta_prefs_add_listener (MetaPrefsChangedFunc func, meta_prefs_add_listener (MetaPrefsChangedFunc func,
gpointer data) gpointer data)
@ -732,7 +728,6 @@ meta_prefs_remove_listener (MetaPrefsChangedFunc func,
meta_bug ("Did not find listener to remove\n"); meta_bug ("Did not find listener to remove\n");
} }
#ifdef HAVE_GCONF
static void static void
emit_changed (MetaPreference pref) emit_changed (MetaPreference pref)
{ {
@ -803,8 +798,26 @@ queue_changed (MetaPreference pref)
changed_idle = g_idle_add_full (META_PRIORITY_PREFS_NOTIFY, changed_idle = g_idle_add_full (META_PRIORITY_PREFS_NOTIFY,
changed_idle_handler, NULL, NULL); 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 */ #endif /* HAVE_GCONF */
static gchar *gconf_dirs_we_are_interested_in[] = { static gchar *gconf_dirs_we_are_interested_in[] = {
"/apps/metacity", "/apps/metacity",
KEY_TERMINAL_DIR, KEY_TERMINAL_DIR,