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

before calling g_type_init.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8b9c1ca904df6729299b25781bc95bcbbe3e6c3c..ceae9e1a63ea7885586fd25682ad56bfcf7a56ef 100644 (file)
--- 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 b9813e2b369142d59b104185e134dc1f98295d12..a64e09c92e7ecf96d0d64810b6820fd4a45d56fe 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 ();