From f829fc770c35f4bc5451a98602fe8e6478c7be10 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 13 Feb 2018 09:44:50 -0500 Subject: [PATCH] main: be more aggressive in assuming X11 backend If the session is started by vncserver right now, the XDG_SESSION_TYPE won't be X11. Ideally that would be fixed, but for backward compatibility we should default to X11 if the session type isn't set to wayland explicitly. --- src/core/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/core/main.c b/src/core/main.c index 828037635..faa20818b 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -332,7 +332,6 @@ find_session_type (void) char *session_id; char *session_type; const char *session_type_env; - gboolean is_tty = FALSE; int ret, i; ret = sd_pid_get_session (0, &session_id); @@ -345,8 +344,7 @@ find_session_type (void) { if (session_type_is_supported (session_type)) goto out; - else - is_tty = g_strcmp0 (session_type, "tty") == 0; + free (session_type); } } @@ -378,8 +376,8 @@ find_session_type (void) goto out; } - /* Legacy support for starting through xinit */ - if (is_tty && (g_getenv ("MUTTER_DISPLAY") || g_getenv ("DISPLAY"))) + /* Legacy support for starting through xinit or vncserver */ + if (g_getenv ("MUTTER_DISPLAY") || g_getenv ("DISPLAY")) { session_type = strdup ("x11"); goto out; -- 2.20.1