summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-12-16 12:19:23 +0100
committerinfirit <[email protected]>2014-12-16 12:19:23 +0100
commitf61b93311585587b105748b77b4b7279b5699a3e (patch)
treeba2b90c8fe25b6421ca40ff862f76b25fca821a0
parent7d3fbfa9e96b48e72e8f00681a6a28f83a768504 (diff)
downloadmate-session-manager-f61b93311585587b105748b77b4b7279b5699a3e.tar.bz2
mate-session-manager-f61b93311585587b105748b77b4b7279b5699a3e.tar.xz
Revert "Drop support for Glib < 2.36"
This reverts commit e017ed5b24f91705facec821afdc066f7a3523b5.
-rw-r--r--configure.ac2
-rw-r--r--mate-session/test-client-dbus.c4
2 files changed, 5 insertions, 1 deletions
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");