Merge from emacs-23

[bpt/emacs.git] / src / xsettings.c

diff --git a/src/xsettings.c b/src/xsettings.c
index b3f3cb6..83ca87e 100644 (file)
--- 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)