[gnome-terminal] client: let DISPLAY flow through



commit ad4ed0a46246ae186f1634d3f4b1ee6667e832aa
Author: Ray Strode <rstrode redhat com>
Date:   Tue Mar 17 15:41:46 2015 -0400

    client: let DISPLAY flow through
    
    gnome-terminal currently unsets DISPLAY before forking its child,
    and then recreates it from gdk_display_get_name when constructing
    the child environment.
    
    This is fine for the X11 backend, but poses a problem for wayland.
    wayland clients don't need DISPLAY set, but X clients using Xwayland
    do. The code to reconstruct DISPLAY when constructing the child
    environment isn't run for the wayland backend (and wouldn't work
    on the wayland backend anyway).
    
    This commit keeps DISPLAY set, so X clients started from gnome-terminal
    work when using the wayland backend.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=746359

 src/terminal-client-utils.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/src/terminal-client-utils.c b/src/terminal-client-utils.c
index 1a7c00f..a7feb24 100644
--- a/src/terminal-client-utils.c
+++ b/src/terminal-client-utils.c
@@ -109,7 +109,6 @@ terminal_client_append_exec_options (GVariantBuilder *builder,
   envv = g_environ_unsetenv (envv, "COLORTERM");
   envv = g_environ_unsetenv (envv, "COLUMNS");
   envv = g_environ_unsetenv (envv, "DESKTOP_STARTUP_ID");
-  envv = g_environ_unsetenv (envv, "DISPLAY");
   envv = g_environ_unsetenv (envv, "GIO_LAUNCHED_DESKTOP_FILE_PID");
   envv = g_environ_unsetenv (envv, "GIO_LAUNCHED_DESKTOP_FILE");
   envv = g_environ_unsetenv (envv, "GNOME_DESKTOP_ICON");


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