* xsettings.c (init_gconf, init_gsettings): Check for Glib 2.36.0

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

diff --git a/src/xsettings.c b/src/xsettings.c
index b9813e2..a64e09c 100644 (file)
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -804,7 +804,9 @@ init_gsettings (void)
   int schema_found = 0;
 
 #ifdef HAVE_G_TYPE_INIT
+#if ! GLIB_CHECK_VERSION (2, 36, 0)
   g_type_init ();
+#endif
 #endif
 
   schemas = g_settings_list_schemas ();
@@ -861,7 +863,9 @@ init_gconf (void)
   char *s;
 
 #ifdef HAVE_G_TYPE_INIT
+#if ! GLIB_CHECK_VERSION (2, 36, 0)
   g_type_init ();
+#endif
 #endif
 
   gconf_client = gconf_client_get_default ();