Only stop use of g_type_init with Glib 2.36

It is still needed in 2.32 from what I can figure out.
master-1.22
infirit 2014-12-16 11:51:08 +01:00
parent deedb94b39
commit 1ea79cc466
2 changed files with 3 additions and 1 deletions

View File

@ -40,7 +40,7 @@ MATE_COMPILE_WARNINGS([maximum])
AM_GLIB_GNU_GETTEXT AM_GLIB_GNU_GETTEXT
GLIB_REQUIRED=2.36.0 GLIB_REQUIRED=2.32.0
GIO_REQUIRED=2.25.12 GIO_REQUIRED=2.25.12
VTE_REQUIRED=0.27.1 VTE_REQUIRED=0.27.1
MATE_DESKTOP_REQUIRED=1.9.0 MATE_DESKTOP_REQUIRED=1.9.0

View File

@ -527,7 +527,9 @@ get_initial_workspace (void)
GdkAtom atom; GdkAtom atom;
GdkAtom cardinal_atom; GdkAtom cardinal_atom;
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init (); g_type_init ();
#endif
window = gdk_get_default_root_window(); window = gdk_get_default_root_window();