diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2010-04-21 20:25:13 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2010-04-21 20:25:13 +0200 |
| commit | 31a01b90454f04d0b1733532bea5d9325e4762ff (patch) | |
| tree | 1c78f58d89dd702dd53172abfa1d5c3ebddace5e | |
| parent | 372b7a959d6ae4b0e9987b93efa1156f2481c012 (diff) | |
| download | emacs-31a01b90454f04d0b1733532bea5d9325e4762ff.tar.gz | |
* xsettings.c: Move misplaced HAVE_GCONF
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/xsettings.c | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a9037d64dd9..acab6a89e49 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/xsettings.c b/src/xsettings.c index b30e79b904e..2dd7f70eb60 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -68,11 +68,6 @@ store_config_changed_event (arg, display_name) #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 @@ struct xsettings 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. */ |