From: Jan Djärv Date: Mon, 16 Sep 2013 18:17:35 +0000 (+0200) Subject: * xsettings.c (init_gconf, init_gsettings): Check for Glib 2.36.0 X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1605 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f386383dc0459fb857c0831aeecb9072f7085d7;p=emacs.git * 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 8b9c1ca904d..ceae9e1a63e 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 b9813e2b369..a64e09c92e7 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 ();