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

before calling g_type_init.

* xsettings.c (init_gconf, init_gsettings): Check for Glib 2.36.0
before calling g_type_init.
3f386383 · Jan Djärv · 6434e343 · 3f386383 · 3f386383
Commit 3f386383 authored Sep 16, 2013 by Jan Djärv
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

src/ChangeLog src/ChangeLog +3 -0

src/xsettings.c src/xsettings.c +4 -0

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 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.

--- 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 ();