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