diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-17 22:54:14 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-17 22:54:14 -0500 |
| commit | 4a47c2757309e338321da1e7a2f6d399a306ce7d (patch) | |
| tree | de441bac2c90c3302459c5f0ffe9c53ec4b31c2f /src/xsettings.c | |
| parent | 8bbb7dd8a6d08540a81a7a2baa2274d8e6d65c92 (diff) | |
| parent | b916cbefa481920a49eac03c7025693f38afc882 (diff) | |
| download | emacs-4a47c2757309e338321da1e7a2f6d399a306ce7d.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'src/xsettings.c')
| -rw-r--r-- | src/xsettings.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xsettings.c b/src/xsettings.c index b3f3cb61541..83ca87ed0bd 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -627,7 +627,9 @@ init_gconf (void) #if defined (HAVE_GCONF) && defined (HAVE_XFT) char *s; +#ifdef HAVE_G_TYPE_INIT g_type_init (); +#endif gconf_client = gconf_client_get_default (); s = gconf_client_get_string (gconf_client, SYSTEM_MONO_FONT, NULL); if (s) |