[gnome-builder] terminal: rollback proxying DISPLAY



commit 5271995bdceac09880a919f20a7d086b144e7d75
Author: Christian Hergert <chergert redhat com>
Date:   Wed Mar 24 11:25:58 2021 -0700

    terminal: rollback proxying DISPLAY
    
    We can't proxy this because it might not match the host $DISPLAY as
    Flatpak could send us X99 instead of X0.
    
    Fixes #1426

 src/libide/foundry/ide-run-manager.c        | 5 +++++
 src/libide/terminal/ide-terminal-launcher.c | 5 +++++
 2 files changed, 10 insertions(+)
---
diff --git a/src/libide/foundry/ide-run-manager.c b/src/libide/foundry/ide-run-manager.c
index 6ca0b1a43..b6d36ebe1 100644
--- a/src/libide/foundry/ide-run-manager.c
+++ b/src/libide/foundry/ide-run-manager.c
@@ -428,7 +428,12 @@ copy_builtin_envvars (IdeEnvironment *environment)
   static const gchar *copy_env[] = {
     "COLORTERM",
     "DESKTOP_SESSION",
+#if 0
+    /* Cannot send DISPLAY which might be different than what
+     * we run on the host (X99 in Flatpak, but X0 in the host).
+     */
     "DISPLAY",
+#endif
     "LANG",
     "WAYLAND_DISPLAY",
     "XDG_CURRENT_DESKTOP",
diff --git a/src/libide/terminal/ide-terminal-launcher.c b/src/libide/terminal/ide-terminal-launcher.c
index db20af1b9..d4c875c24 100644
--- a/src/libide/terminal/ide-terminal-launcher.c
+++ b/src/libide/terminal/ide-terminal-launcher.c
@@ -103,7 +103,12 @@ copy_envvars (gpointer instance)
   static const gchar *copy_env[] = {
     "COLORTERM",
     "DESKTOP_SESSION",
+#if 0
+    /* Cannot send DISPLAY which might be different than what
+     * we run on the host (X99 in Flatpak, but X0 in the host).
+     */
     "DISPLAY",
+#endif
     "LANG",
     "WAYLAND_DISPLAY",
     "XDG_CURRENT_DESKTOP",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]