[Emacs-diffs] trunk r114304: * xsettings.c (init_gconf, init_gsettings): Check for Glib 2.36.0

[Jan D.]

------------------------------------------------------------
revno: 114304
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-16 20:17:35 +0200
message:
  * xsettings.c (init_gconf, init_gsettings): Check for Glib 2.36.0
  before calling g_type_init.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xsettings.c                xsettings.c-20091117210551-bqxn4u9uesl3d17a-4

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-16 15:55:02 +0000
+++ b/src/ChangeLog     2013-09-16 18:17:35 +0000
@@ -1,5 +1,8 @@
 2013-09-16  Jan Djärv  <address@hidden>
 
+       * 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.

=== modified file 'src/xsettings.c'
--- a/src/xsettings.c   2013-09-16 10:41:41 +0000
+++ b/src/xsettings.c   2013-09-16 18:17:35 +0000
@@ -804,8 +804,10 @@
   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 @@
   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);