diff options
| author | infirit <[email protected]> | 2014-12-16 13:10:13 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-12-16 13:10:13 +0100 |
| commit | 3037f574e89e3b34a075adf804c562b5963b73b7 (patch) | |
| tree | 693fa41c50c8134111b600d1340721ecd5db7217 | |
| parent | f61b93311585587b105748b77b4b7279b5699a3e (diff) | |
| download | mate-session-manager-3037f574e89e3b34a075adf804c562b5963b73b7.tar.bz2 mate-session-manager-3037f574e89e3b34a075adf804c562b5963b73b7.tar.xz | |
Revert "Revert "Drop support for Glib < 2.36""
This reverts commit f61b93311585587b105748b77b4b7279b5699a3e.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | mate-session/test-client-dbus.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 92a3d5f..4d5a9cb 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.16.0 +GLIB_REQUIRED=2.36.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 8f8fbe9..a41255a 100644 --- a/mate-session/test-client-dbus.c +++ b/mate-session/test-client-dbus.c @@ -240,10 +240,6 @@ 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"); |