Mercurial > emacs
changeset 107807:2311789d4888
* xsettings.c (XSETTINGS_FONT_NAME): Move XSETTINGS_FONT_NAME out of HAVE_GCONF.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 08 Apr 2010 20:22:51 +0200 |
| parents | ba0339bda073 |
| children | 0a321c28c1b4 |
| files | src/ChangeLog src/xsettings.c |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Apr 08 20:35:10 2010 +0300 +++ b/src/ChangeLog Thu Apr 08 20:22:51 2010 +0200 @@ -1,3 +1,8 @@ +2010-04-08 Jan Djärv <jan.h.d@swipnet.se> + + * xsettings.c (XSETTINGS_FONT_NAME): Move XSETTINGS_FONT_NAME out of + HAVE_GCONF. + 2010-04-08 Eli Zaretskii <eliz@gnu.org> * bidi.c (bidi_resolve_weak): Use prev.type_after_w1, instead of
--- a/src/xsettings.c Thu Apr 08 20:35:10 2010 +0300 +++ b/src/xsettings.c Thu Apr 08 20:22:51 2010 +0200 @@ -64,11 +64,12 @@ 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. */