Commit 3f386383 authored by Jan Djärv's avatar Jan Djärv
Browse files

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

before calling g_type_init.
parent 6434e343
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.
......
......@@ -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 ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment