From a8d2707825c4b1d25f483f45c5665472dcaa9b5b Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 16 Dec 2014 13:14:17 +0100 Subject: [PATCH] Revert "Only stop use of g_type_init with Glib 2.36" This reverts commit 1ea79cc4669b5d760a1cc6a614eabe8223a9db6d. --- configure.ac | 2 +- src/terminal.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6fa775c..b6cdbf1 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ MATE_COMPILE_WARNINGS([maximum]) AM_GLIB_GNU_GETTEXT -GLIB_REQUIRED=2.32.0 +GLIB_REQUIRED=2.36.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 2d70c06..2eca2a2 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -527,9 +527,7 @@ 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();