mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-22 18:35:09 +00:00
Code Issues Releases Activity

* xsettings.c: Move misplaced HAVE_GCONF

Browse Source
This commit is contained in:
Jan Djärv 2010-04-21 20:25:13 +02:00
parent 372b7a959d
commit 31a01b9045
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ChangeLog
View File

@ -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.

10
src/xsettings.c
View File

@ -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. */