From a03111a3d16d22176dd4c5dd8304053c9e67005e Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 9 Aug 2022 14:51:53 +0100 Subject: [PATCH] enter: Don't overwrite the DISPLAY Now that we're using the same display number in the sandbox as on the host, we can forget about overwriting it with :99. Signed-off-by: Simon McVittie --- app/flatpak-builtins-enter.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/flatpak-builtins-enter.c b/app/flatpak-builtins-enter.c index 6c0d9dee..7a514a7e 100644 --- a/app/flatpak-builtins-enter.c +++ b/app/flatpak-builtins-enter.c @@ -248,7 +248,6 @@ flatpak_builtin_enter (int argc, for (e = environment; e < environment + environment_len; e = e + strlen (e) + 1) { if (*e != 0 && - !g_str_has_prefix (e, "DISPLAY=") && !g_str_has_prefix (e, "PULSE_SERVER=") && !g_str_has_prefix (e, "PULSE_CLIENTCONFIG=") && !g_str_has_prefix (e, "XDG_RUNTIME_DIR=") && @@ -264,9 +263,6 @@ flatpak_builtin_enter (int argc, xdg_runtime_dir = g_strdup_printf ("/run/user/%d", uid); g_ptr_array_add (envp_array, g_strdup_printf ("XDG_RUNTIME_DIR=%s", xdg_runtime_dir)); - if (g_file_test ("/tmp/.X11-unix/X99", G_FILE_TEST_EXISTS)) - g_ptr_array_add (envp_array, g_strdup ("DISPLAY=:99.0")); - pulse_path = g_strdup_printf ("/run/user/%d/pulse/native", uid); if (g_file_test (pulse_path, G_FILE_TEST_EXISTS)) {