From 1ea79cc4669b5d760a1cc6a614eabe8223a9db6d Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 16 Dec 2014 11:51:08 +0100 Subject: [PATCH] Only stop use of g_type_init with Glib 2.36 It is still needed in 2.32 from what I can figure out. --- configure.ac | 2 +- src/terminal.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b6cdbf1..6fa775c 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ MATE_COMPILE_WARNINGS([maximum]) AM_GLIB_GNU_GETTEXT -GLIB_REQUIRED=2.36.0 +GLIB_REQUIRED=2.32.0 GIO_REQUIRED=2.25.12 VTE_REQUIRED=0.27.1 MATE_DESKTOP_REQUIRED=1.9.0 diff --git a/src/terminal.c b/src/terminal.c index 2eca2a2..2d70c06 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -527,7 +527,9 @@ get_initial_workspace (void) GdkAtom atom; GdkAtom cardinal_atom; +#if !GLIB_CHECK_VERSION (2, 36, 0) g_type_init (); +#endif window = gdk_get_default_root_window();