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

fix two places where there was a warning if GConf was turned off.

Browse Source 
* src/core/prefs.c: fix two places where there was a warning
	if GConf was turned off.


svn path=/trunk/; revision=4023
This commit is contained in:
Thomas James Alexander Thurman 2008-11-22 19:10:50 +00:00
parent ac365b4ead
commit 38cd6a6c1f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-11-22 Thomas Thurman <tthurman@gnome.org>
* src/core/prefs.c: fix two places where there was a warning
if GConf was turned off.
2008-11-22 Thomas Thurman <tthurman@gnome.org> 2008-11-22 Thomas Thurman <tthurman@gnome.org>
* src/core/all-keybindings.h: "backward", not "backwards" throughout. * src/core/all-keybindings.h: "backward", not "backwards" throughout.

4
src/core/prefs.c
View File

@ -68,8 +68,8 @@
static GConfClient *default_client = NULL; static GConfClient *default_client = NULL;
static GList *changes = NULL; static GList *changes = NULL;
static guint changed_idle; static guint changed_idle;
#endif
static GList *listeners = NULL; static GList *listeners = NULL;
#endif
static gboolean use_system_font = FALSE; static gboolean use_system_font = FALSE;
static PangoFontDescription *titlebar_font = NULL; static PangoFontDescription *titlebar_font = NULL;
@ -976,6 +976,7 @@ meta_prefs_remove_listener (MetaPrefsChangedFunc func,
/* Initialisation. */ /* Initialisation. */
/****************************************************************************/ /****************************************************************************/
#ifdef HAVE_GCONF
/* @@@ again, use glib's ability to tell you the size of the array */ /* @@@ again, use glib's ability to tell you the size of the array */
static gchar *gconf_dirs_we_are_interested_in[] = { static gchar *gconf_dirs_we_are_interested_in[] = {
"/apps/metacity", "/apps/metacity",
@ -985,6 +986,7 @@ static gchar *gconf_dirs_we_are_interested_in[] = {
"/desktop/gnome/interface", "/desktop/gnome/interface",
NULL, NULL,
}; };
#endif
void void
meta_prefs_init (void) meta_prefs_init (void)