Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
31a01b90
Commit
31a01b90
authored
Apr 21, 2010
by
Jan Djärv
Browse files
* xsettings.c: Move misplaced HAVE_GCONF
parent
372b7a95
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
src/ChangeLog
src/ChangeLog
+1
-0
src/xsettings.c
src/xsettings.c
+5
-5
No files found.
src/ChangeLog
View file @
31a01b90
...
...
@@ -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.
...
...
src/xsettings.c
View file @
31a01b90
...
...
@@ -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. */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment