From f61b93311585587b105748b77b4b7279b5699a3e Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 16 Dec 2014 12:19:23 +0100 Subject: Revert "Drop support for Glib < 2.36" This reverts commit e017ed5b24f91705facec821afdc066f7a3523b5. --- configure.ac | 2 +- mate-session/test-client-dbus.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4d5a9cb..92a3d5f 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ AC_ARG_WITH([gtk], [with_gtk=2.0]) AC_MSG_RESULT([$with_gtk]) -GLIB_REQUIRED=2.36.0 +GLIB_REQUIRED=2.16.0 GIO_REQUIRED=2.25.0 DBUS_GLIB_REQUIRED=0.76 UPOWER_REQUIRED=0.9.0 diff --git a/mate-session/test-client-dbus.c b/mate-session/test-client-dbus.c index a41255a..8f8fbe9 100644 --- a/mate-session/test-client-dbus.c +++ b/mate-session/test-client-dbus.c @@ -240,6 +240,10 @@ main (int argc, g_log_set_always_fatal (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING); +#if !GLIB_CHECK_VERSION (2, 36, 0) + g_type_init (); +#endif + res = session_manager_connect (); if (! res) { g_warning ("Unable to connect to session manager"); -- cgit v1.2.1