procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
No need to define when HAVE_GSETTINGS || !HAVE_XFT.
This commit is contained in:
Paul Eggert 2011-07-02 23:17:19 -07:00
parent cf7cff5784
commit 2e13213db2
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
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.
2011-07-02 Chong Yidong <cyd@stupidchicken.com>

8
src/xsettings.c
View file

@ -128,7 +128,6 @@ struct xsettings
#ifdef HAVE_GSETTINGS
#define GSETTINGS_SCHEMA "org.gnome.desktop.interface"
#define SYSTEM_MONO_FONT "monospace-font-name"
#define SYSTEM_FONT "font-name"
static void
something_changedCB (GSettings *settings,
@ -153,7 +152,10 @@ something_changedCB (GSettings *settings,
#else
#ifdef HAVE_GCONF
#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,
that is SYSTEM_MONO_FONT. */
@ -697,7 +699,7 @@ init_gsettings (void)
g_object_ref_sink (G_OBJECT (gsettings_client));
val = g_settings_get_value (gsettings_client, SYSTEM_MONO_FONT);
if (val)
if (val)
{
g_variant_ref_sink (val);
if (g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))