diff options
| author | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-11-22 19:10:50 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-11-22 19:10:50 +0000 |
| commit | 38cd6a6c1fd9646e64d46d86d58d95621d8579ad (patch) | |
| tree | 66b39b1523bcb824c35ddea20c73d1ee02c1ddf3 | |
| parent | ac365b4ead0789ac95a23f33ec831eaa99dd210c (diff) | |
| download | metacity-38cd6a6c1fd9646e64d46d86d58d95621d8579ad.tar.gz | |
fix two places where there was a warning if GConf was turned off.
* src/core/prefs.c: fix two places where there was a warning
if GConf was turned off.
svn path=/trunk/; revision=4023
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/core/prefs.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,5 +1,10 @@ 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> + * src/core/all-keybindings.h: "backward", not "backwards" throughout. 2008-11-20 Thomas Thurman <tthurman@gnome.org> diff --git a/src/core/prefs.c b/src/core/prefs.c index 02f38a27..d0fb1c9c 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -68,8 +68,8 @@ static GConfClient *default_client = NULL; static GList *changes = NULL; static guint changed_idle; -#endif static GList *listeners = NULL; +#endif static gboolean use_system_font = FALSE; static PangoFontDescription *titlebar_font = NULL; @@ -976,6 +976,7 @@ meta_prefs_remove_listener (MetaPrefsChangedFunc func, /* Initialisation. */ /****************************************************************************/ +#ifdef HAVE_GCONF /* @@@ again, use glib's ability to tell you the size of the array */ static gchar *gconf_dirs_we_are_interested_in[] = { "/apps/metacity", @@ -985,6 +986,7 @@ static gchar *gconf_dirs_we_are_interested_in[] = { "/desktop/gnome/interface", NULL, }; +#endif void meta_prefs_init (void) |