Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
2e13213d
Commit
2e13213d
authored
Jul 02, 2011
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* xsettings.c (SYSTEM_FONT): Define only when used.
No need to define when HAVE_GSETTINGS || !HAVE_XFT.
parent
cf7cff57
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
src/ChangeLog
src/ChangeLog
+3
-0
src/xsettings.c
src/xsettings.c
+5
-3
No files found.
src/ChangeLog
View file @
2e13213d
2011-07-03 Paul Eggert <eggert@cs.ucla.edu>
* xsettings.c (SYSTEM_FONT): Define only when used.
No need to define when HAVE_GSETTINGS || !HAVE_XFT.
* keymap.c (access_keymap_1): Now static.
2011-07-02 Chong Yidong <cyd@stupidchicken.com>
...
...
src/xsettings.c
View file @
2e13213d
...
...
@@ -128,7 +128,6 @@ struct xsettings
#ifdef HAVE_GSETTINGS
#define GSETTINGS_SCHEMA "org.gnome.desktop.interface"
#define SYSTEM_MONO_FONT "monospace-font-name"
#define SYSTEM_FONT "font-name"
static
void
something_changedCB
(
GSettings
*
settings
,
...
...
@@ -153,7 +152,10 @@ something_changedCB (GSettings *settings,
#else
#ifdef HAVE_GCONF
#define SYSTEM_MONO_FONT "/desktop/gnome/interface/monospace_font_name"
#define SYSTEM_FONT "/desktop/gnome/interface/font_name"
#ifdef HAVE_XFT
# define SYSTEM_FONT "/desktop/gnome/interface/font_name"
#endif
/* Callback called when something changed in GConf that we care about,
that is SYSTEM_MONO_FONT. */
...
...
@@ -697,7 +699,7 @@ init_gsettings (void)
g_object_ref_sink
(
G_OBJECT
(
gsettings_client
));
val
=
g_settings_get_value
(
gsettings_client
,
SYSTEM_MONO_FONT
);
if
(
val
)
if
(
val
)
{
g_variant_ref_sink
(
val
);
if
(
g_variant_is_of_type
(
val
,
G_VARIANT_TYPE_STRING
))
...
...
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