From: Jan Djärv Date: Thu, 8 Apr 2010 18:22:51 +0000 (+0200) Subject: * xsettings.c (XSETTINGS_FONT_NAME): Move XSETTINGS_FONT_NAME out of HAVE_GCONF. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~562 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0269ef77309827f774779a2df95aca858fd96146;p=emacs.git * xsettings.c (XSETTINGS_FONT_NAME): Move XSETTINGS_FONT_NAME out of HAVE_GCONF. --- diff --git a/src/ChangeLog b/src/ChangeLog index ba7687d7841..e32a1bbc99e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-04-08 Jan Djärv + + * xsettings.c (XSETTINGS_FONT_NAME): Move XSETTINGS_FONT_NAME out of + HAVE_GCONF. + 2010-04-08 Eli Zaretskii * bidi.c (bidi_resolve_weak): Use prev.type_after_w1, instead of diff --git a/src/xsettings.c b/src/xsettings.c index b71871df573..1db7a24ebad 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -64,11 +64,12 @@ store_font_changed_event (arg, display_name) kbd_buffer_store_event (&event); } +#define XSETTINGS_FONT_NAME "Gtk/FontName" + #ifdef HAVE_GCONF #define SYSTEM_MONO_FONT "/desktop/gnome/interface/monospace_font_name" #define SYSTEM_FONT "/desktop/gnome/interface/font_name" -#define XSETTINGS_FONT_NAME "Gtk/FontName" /* Callback called when something changed in GConf that we care about, that is SYSTEM_MONO_FONT. */