[mutter/wip/carlosg/xwayland-startup-side-channel: 10/13] core: Use DISPLAY envvar to forward in the launch context

[Carlos Garnacho <carlosg src gnome org>]

commit 38e58b837ba4ab6cbdc62e6b73b48897eed1e89e
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Nov 14 23:50:30 2019 +0100

    core: Use DISPLAY envvar to forward in the launch context
    
    The meta_x11_get_display_name() will return our private connection, which
    is not what we want to transfer to clients being launched.
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/945

 src/core/meta-launch-context.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/src/core/meta-launch-context.c b/src/core/meta-launch-context.c
index 8cc052452..984338c1b 100644
--- a/src/core/meta-launch-context.c
+++ b/src/core/meta-launch-context.c
@@ -114,7 +114,7 @@ meta_launch_context_constructed (GObject *object)
 
   G_OBJECT_CLASS (meta_launch_context_parent_class)->constructed (object);
 
-  x11_display = meta_x11_get_display_name ();
+  x11_display = getenv ("DISPLAY");
   wayland_display = getenv ("WAYLAND_DISPLAY");
 
   if (x11_display)