Commit 2e13213d authored by Paul Eggert's avatar Paul Eggert
Browse files

* xsettings.c (SYSTEM_FONT): Define only when used.

No need to define when HAVE_GSETTINGS || !HAVE_XFT.
parent cf7cff57
2011-07-03 Paul Eggert <eggert@cs.ucla.edu> 2011-07-03 Paul Eggert <eggert@cs.ucla.edu>
* xsettings.c (SYSTEM_FONT): Define only when used.
No need to define when HAVE_GSETTINGS || !HAVE_XFT.
* keymap.c (access_keymap_1): Now static. * keymap.c (access_keymap_1): Now static.
2011-07-02 Chong Yidong <cyd@stupidchicken.com> 2011-07-02 Chong Yidong <cyd@stupidchicken.com>
......
...@@ -128,7 +128,6 @@ struct xsettings ...@@ -128,7 +128,6 @@ struct xsettings
#ifdef HAVE_GSETTINGS #ifdef HAVE_GSETTINGS
#define GSETTINGS_SCHEMA "org.gnome.desktop.interface" #define GSETTINGS_SCHEMA "org.gnome.desktop.interface"
#define SYSTEM_MONO_FONT "monospace-font-name" #define SYSTEM_MONO_FONT "monospace-font-name"
#define SYSTEM_FONT "font-name"
static void static void
something_changedCB (GSettings *settings, something_changedCB (GSettings *settings,
...@@ -153,7 +152,10 @@ something_changedCB (GSettings *settings, ...@@ -153,7 +152,10 @@ something_changedCB (GSettings *settings,
#else #else
#ifdef HAVE_GCONF #ifdef HAVE_GCONF
#define SYSTEM_MONO_FONT "/desktop/gnome/interface/monospace_font_name" #define SYSTEM_MONO_FONT "/desktop/gnome/interface/monospace_font_name"
#define SYSTEM_FONT "/desktop/gnome/interface/font_name"
#ifdef HAVE_XFT
# define SYSTEM_FONT "/desktop/gnome/interface/font_name"
#endif
/* Callback called when something changed in GConf that we care about, /* Callback called when something changed in GConf that we care about,
that is SYSTEM_MONO_FONT. */ that is SYSTEM_MONO_FONT. */
...@@ -697,7 +699,7 @@ init_gsettings (void) ...@@ -697,7 +699,7 @@ init_gsettings (void)
g_object_ref_sink (G_OBJECT (gsettings_client)); g_object_ref_sink (G_OBJECT (gsettings_client));
val = g_settings_get_value (gsettings_client, SYSTEM_MONO_FONT); val = g_settings_get_value (gsettings_client, SYSTEM_MONO_FONT);
if (val) if (val)
{ {
g_variant_ref_sink (val); g_variant_ref_sink (val);
if (g_variant_is_of_type (val, G_VARIANT_TYPE_STRING)) if (g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment