diff options
| author | Ray Strode <rstrode@redhat.com> | 2018-02-13 09:44:50 -0500 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2019-02-12 10:43:10 -0500 |
| commit | e4da08218a402552601d4c5cb7e559c5171d371b (patch) | |
| tree | 384fabf129d597c2a07fde94164058069597cc0a | |
| parent | d720a0a36617c69dd12d520c3ab8818982ec95c8 (diff) | |
| download | mutter-e4da08218a402552601d4c5cb7e559c5171d371b.tar.gz | |
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.
| -rw-r--r-- | src/core/main.c | 8 |
1 files 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; |