From 3e95609073b3a455693e19e58b365688b7f877ba Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Wed, 1 Jun 2022 09:39:01 +0200
Subject: compositor/dnd: Guard X11 types

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2445>
---
 src/backends/meta-dnd-private.h | 7 ++++++-
 src/compositor/meta-dnd.c       | 4 ++++
 src/x11/meta-x11-display.c      | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/backends/meta-dnd-private.h b/src/backends/meta-dnd-private.h
index a4cb37220..856b88942 100644
--- a/src/backends/meta-dnd-private.h
+++ b/src/backends/meta-dnd-private.h
@@ -21,17 +21,22 @@
 #define META_DND_PRIVATE__H
 
 #include <glib.h>
+
+#ifdef HAVE_X11
 #include <X11/Xlib.h>
+#include "compositor/meta-compositor-x11.h"
+#endif
 
 #include "backends/meta-backend-private.h"
-#include "compositor/meta-compositor-x11.h"
 
+#ifdef HAVE_X11
 gboolean meta_dnd_handle_xdnd_event (MetaBackend       *backend,
                                      MetaCompositorX11 *compositor_x11,
                                      Display           *xdisplay,
                                      XEvent            *xev);
 
 void meta_dnd_init_xdnd (MetaX11Display *x11_display);
+#endif
 
 #ifdef HAVE_WAYLAND
 void meta_dnd_wayland_handle_begin_modal (MetaCompositor *compositor);
diff --git a/src/compositor/meta-dnd.c b/src/compositor/meta-dnd.c
index 33bd6ad90..a8dcd0c7b 100644
--- a/src/compositor/meta-dnd.c
+++ b/src/compositor/meta-dnd.c
@@ -125,6 +125,7 @@ meta_dnd_get_backend (MetaDnd *dnd)
   return priv->backend;
 }
 
+#ifdef HAVE_X11
 void
 meta_dnd_init_xdnd (MetaX11Display *x11_display)
 {
@@ -155,6 +156,7 @@ meta_dnd_init_xdnd (MetaX11Display *x11_display)
                    XInternAtom (xdisplay, "XdndProxy", False), XA_WINDOW,
                    32, PropModeReplace, (const unsigned char *) &xwindow, 1);
 }
+#endif
 
 static void
 meta_dnd_notify_dnd_enter (MetaDnd *dnd)
@@ -184,6 +186,7 @@ meta_dnd_notify_dnd_leave (MetaDnd *dnd)
  *
  * http://www.freedesktop.org/wiki/Specifications/XDND
  */
+#ifdef HAVE_X11
 gboolean
 meta_dnd_handle_xdnd_event (MetaBackend       *backend,
                             MetaCompositorX11 *compositor_x11,
@@ -243,6 +246,7 @@ meta_dnd_handle_xdnd_event (MetaBackend       *backend,
 
   return FALSE;
 }
+#endif
 
 #ifdef HAVE_WAYLAND
 static MetaWaylandDataDevice *
diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c
index ac0ab8156..b25da53fa 100644
--- a/src/x11/meta-x11-display.c
+++ b/src/x11/meta-x11-display.c
@@ -1429,8 +1429,10 @@ meta_x11_display_new (MetaDisplay  *display,
   meta_x11_startup_notification_init (x11_display);
   meta_x11_selection_init (x11_display);
 
+#ifdef HAVE_X11
   if (!meta_is_wayland_compositor ())
     meta_dnd_init_xdnd (x11_display);
+#endif
 
   sprintf (buf, "WM_S%d", number);
 
-- 
cgit v1.2.1