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

before calling g_type_init.

2 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8b9c1ca904d..ceae9e1a63e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2013-09-16  Jan Djärv  <jan.h.d@swipnet.se>
 
+        * xsettings.c (init_gconf, init_gsettings): Check for Glib 2.36.0
+        before calling g_type_init.
+
         * font.c (syms_of_font): Move call to syms_of_(ns|mac)font ...
 
         * nsterm.m (syms_of_nsterm): ... to here.
diff --git a/src/xsettings.c b/src/xsettings.c
index b9813e2b369..a64e09c92e7 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -804,8 +804,10 @@ 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 ();
   if (schemas == NULL) return;
@@ -861,8 +863,10 @@ 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 ();
   gconf_client_set_error_handling (gconf_client, GCONF_CLIENT_HANDLE_NONE);