procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
before calling g_type_init.
This commit is contained in:
Jan Djärv 2013-09-16 20:17:35 +02:00
parent 6434e34375
commit 3f386383dc
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
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.

4
src/xsettings.c
View file

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