general: Allow to compile on Wayland-only system

Remove unneeded includes and add some guards to X11-only code.

7 files changed, 16 insertions, 14 deletions

diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c
index f95eaa3d6..45b072db3 100644
--- a/eel/eel-gtk-extensions.c
+++ b/eel/eel-gtk-extensions.c
@@ -29,10 +29,7 @@
 #include "eel-glib-extensions.h"
 #include "eel-string.h"
 
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
 #include <gdk/gdk.h>
-#include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <math.h>
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index fb2833372..17f1da59a 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -29,7 +29,7 @@
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 #include <fcntl.h>
-#include <gdk/gdkx.h>
+#include <gdk/gdk.h>
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
diff --git a/src/nautilus-canvas-container.c b/src/nautilus-canvas-container.c
index 1035fa2b8..932439ffe 100644
--- a/src/nautilus-canvas-container.c
+++ b/src/nautilus-canvas-container.c
@@ -29,14 +29,12 @@
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-vfs-extensions.h>
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
+#include <gdk/gdk.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
 
 #define DEBUG_FLAG NAUTILUS_DEBUG_CANVAS_CONTAINER
 #include "nautilus-debug.h"
diff --git a/src/nautilus-canvas-dnd.c b/src/nautilus-canvas-dnd.c
index c5a51bca5..9d5a5c67b 100644
--- a/src/nautilus-canvas-dnd.c
+++ b/src/nautilus-canvas-dnd.c
@@ -45,7 +45,7 @@
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
+#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 1a1089ac6..db84bd191 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -33,7 +33,7 @@
 #include <fcntl.h>
 #include <gdesktop-enums.h>
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
+#include <gdk/gdk.h>
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index 83c66044e..316066d4c 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -23,7 +23,9 @@
 
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
+#ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
+#endif
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
@@ -1204,12 +1206,17 @@ search_for_application_mime_type (ActivateParametersInstall *parameters_install,
 
     g_assert (parameters_install->proxy != NULL);
 
-    /* get XID from parent window */
-    window = gtk_widget_get_window (GTK_WIDGET (parameters_install->parent_window));
-    if (window != NULL)
+#ifdef GDK_WINDOWING_X11
+    if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
     {
-        xid = GDK_WINDOW_XID (window);
+        /* get XID from parent window */
+        window = gtk_widget_get_window (GTK_WIDGET (parameters_install->parent_window));
+        if (window != NULL)
+        {
+            xid = GDK_WINDOW_XID (window);
+        }
     }
+#endif
 
     mime_types[0] = mime_type;
     mime_types[1] = NULL;
diff --git a/src/nautilus-shell-search-provider.c b/src/nautilus-shell-search-provider.c
index 056737478..e9cd5003b 100644
--- a/src/nautilus-shell-search-provider.c
+++ b/src/nautilus-shell-search-provider.c
@@ -26,7 +26,7 @@
 #include <gio/gio.h>
 #include <string.h>
 #include <glib/gi18n.h>
-#include <gdk/gdkx.h>
+#include <gdk/gdk.h>
 
 #include "nautilus-file.h"
 #include "nautilus-file-utilities.h"