diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | mate-session/main.c | 1 | ||||
| -rw-r--r-- | mate-session/test-client-dbus.c | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index a9e0aa8..dd52187 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.28.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/main.c b/mate-session/main.c index f2831a9..b57be06 100644 --- a/mate-session/main.c +++ b/mate-session/main.c @@ -581,6 +581,7 @@ int main(int argc, char** argv) * was specified on the command line. */ display_str = gdk_display_get_name (gdk_display_get_default()); + gsm_util_setenv("DISPLAY", display_str); /* Some third-party programs rely on MATE_DESKTOP_SESSION_ID to * detect if MATE is running. We keep this for compatibility reasons. 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"); |