Mercurial > emacs
changeset 108031:c10fc3731b2c
* xsettings.c: Move misplaced HAVE_GCONF
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Wed, 21 Apr 2010 20:25:13 +0200 |
| parents | c964c5fcf1f2 |
| children | 9e4618c4ed12 |
| files | src/ChangeLog src/xsettings.c |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Apr 21 20:59:39 2010 +0300 +++ b/src/ChangeLog Wed Apr 21 20:25:13 2010 +0200 @@ -33,6 +33,7 @@ Qtool_bar_style. Initialize current_tool_bar_style to nil. defsubr Stool_bar_get_system_style. Fprovide on dynamic-setting. + Move misplaced HAVE_GCONF * xsettings.h (Ftool_bar_get_system_style): Declare.
--- a/src/xsettings.c Wed Apr 21 20:59:39 2010 +0300 +++ b/src/xsettings.c Wed Apr 21 20:25:13 2010 +0200 @@ -68,11 +68,6 @@ #define XSETTINGS_FONT_NAME "Gtk/FontName" #define XSETTINGS_TOOL_BAR_STYLE "Gtk/ToolbarStyle" -#ifdef HAVE_GCONF - -#define SYSTEM_MONO_FONT "/desktop/gnome/interface/monospace_font_name" -#define SYSTEM_FONT "/desktop/gnome/interface/font_name" - enum { SEEN_AA = 0x01, SEEN_HINTING = 0x02, @@ -97,6 +92,11 @@ unsigned seen; }; +#ifdef HAVE_GCONF + +#define SYSTEM_MONO_FONT "/desktop/gnome/interface/monospace_font_name" +#define SYSTEM_FONT "/desktop/gnome/interface/font_name" + /* Callback called when something changed in GConf that we care about, that is SYSTEM_MONO_FONT. */