[gnome-shell/wip/carlosg/x11less-preparations: 3/3] shell: Only initialize global->xdisplay on X11 compositors

[Carlos Garnacho <carlosg src gnome org>]

commit e99adbefb6eb7d5318aa4114eec688a947dda947
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Jan 31 12:03:34 2019 +0100

    shell: Only initialize global->xdisplay on X11 compositors
    
    This is just used to set up things that are relevant to X11 compositors
    (XDND, XFixes input region). We can live with it unset on the wayland
    compositor cases.

 src/shell-global.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/shell-global.c b/src/shell-global.c
index 8f778c0f1..ce5b046d5 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -61,8 +61,6 @@ struct _ShellGlobal {
 
   MetaDisplay *meta_display;
   MetaWorkspaceManager *workspace_manager;
-  GdkDisplay *gdk_display;
-  MetaX11Display *x11_display;
   Display *xdisplay;
 
   char *session_mode;
@@ -849,10 +847,12 @@ _shell_global_set_plugin (ShellGlobal *global,
   display = meta_plugin_get_display (plugin);
   global->meta_display = display;
   global->workspace_manager = meta_display_get_workspace_manager (display);
-  global->x11_display = meta_display_get_x11_display (display);
-  global->xdisplay = meta_x11_display_get_xdisplay (global->x11_display);
 
-  global->gdk_display = gdk_x11_lookup_xdisplay (global->xdisplay);
+  if (!meta_is_wayland_compositor ())
+    {
+      MetaX11Display *x11_display = meta_display_get_x11_display (display);
+      global->xdisplay = meta_x11_display_get_xdisplay (x11_display);
+    }
 
   global->stage = CLUTTER_STAGE (meta_get_stage_for_display (display));