From 3f386383dc0459fb857c0831aeecb9072f7085d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 16 Sep 2013 20:17:35 +0200 Subject: [PATCH] * xsettings.c (init_gconf, init_gsettings): Check for Glib 2.36.0 before calling g_type_init. --- src/ChangeLog | 3 +++ src/xsettings.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 8b9c1ca904..ceae9e1a63 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2013-09-16 Jan Djärv + * 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 b9813e2b36..a64e09c92e 100644 --- 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 (); -- 2.20.1