4 files changed, 28 insertions, 15 deletions
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index 8f6ec8d3..ff5442c6 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -1,10 +1,15 @@
 SUBDIRS =				\
 	libstatus-notifier-watcher	\
-	status-notifier			\
-	system-tray
+	status-notifier
+
+if ENABLE_X11
+SUBDIRS += \
+        system-tray
 
-noinst_LTLIBRARIES = libtray.la
 noinst_PROGRAMS = testtray
+endif
+
+noinst_LTLIBRARIES = libtray.la
 
 AM_CPPFLAGS =							\
 	$(NOTIFICATION_AREA_CFLAGS)				\
@@ -29,9 +34,18 @@ libtray_la_SOURCES =				\
 
 libtray_la_LIBADD =							\
 	libstatus-notifier-watcher/libstatus-notifier-watcher.la	\
-	status-notifier/libstatus-notifier.la				\
+	status-notifier/libstatus-notifier.la	
+
+if ENABLE_X11
+libtray_la_LIBADD +=							\
 	system-tray/libsystem-tray.la
 
+testtray_SOURCES = testtray.c
+testtray_LDADD =			\
+	libtray.la \
+	$(NOTIFICATION_AREA_LIBS)
+endif 
+
 NOTIFICATION_AREA_SOURCES = \
 	main.c \
 	main.h \
@@ -43,12 +57,6 @@ NOTIFICATION_AREA_LDADD =				\
 	$(NOTIFICATION_AREA_LIBS)			\
 	$(LIBMATE_PANEL_APPLET_LIBS)
 
-
-testtray_SOURCES = testtray.c
-testtray_LDADD =			\
-	libtray.la \
-	$(NOTIFICATION_AREA_LIBS)
-
 if NOTIFICATION_AREA_INPROCESS
 APPLET_IN_PROCESS = true
 APPLET_LOCATION   = $(pkglibdir)/libnotification-area-applet.so
diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
index 71221b65..20ef2b3c 100644
--- a/applets/notification_area/main.c
+++ b/applets/notification_area/main.c
@@ -23,10 +23,6 @@
 
 #include <config.h>
 
-#ifndef HAVE_X11
-#error file should only be built when HAVE_X11 is enabled
-#endif
-
 #include <string.h>
 
 #include <mate-panel-applet.h>
@@ -302,7 +298,6 @@ static void
 na_tray_applet_realize (GtkWidget *widget)
 {
   NaTrayApplet      *applet = NA_TRAY_APPLET (widget);
-
   if (parent_class_realize)
     parent_class_realize (widget);
 
diff --git a/applets/notification_area/na-grid.c b/applets/notification_area/na-grid.c
index 9a4c45d9..0fa82494 100644
--- a/applets/notification_area/na-grid.c
+++ b/applets/notification_area/na-grid.c
@@ -29,7 +29,10 @@
 
 #include "na-grid.h"
 
+#ifdef HAVE_X11 
 #include "system-tray/na-tray.h"
+#endif
+
 #include "status-notifier/sn-host-v0.h"
 
 #define MIN_ICON_SIZE_DEFAULT 24
@@ -324,6 +327,7 @@ na_grid_realize (GtkWidget *widget)
   display = gdk_display_get_default ();
   /* Instantiate the hosts now we have a screen */
   screen = gtk_widget_get_screen (GTK_WIDGET (self));
+#ifdef HAVE_X11
   if  (GDK_IS_X11_DISPLAY (display))
   {
     GtkOrientation orientation;
@@ -337,6 +341,7 @@ na_grid_realize (GtkWidget *widget)
 
     add_host (self, tray_host);
   }
+#endif
   settings = g_settings_new ("org.mate.panel");
   if (g_settings_get_boolean (settings, "enable-sni-support"))
     add_host (self, sn_host_v0_new ());
diff --git a/applets/notification_area/na-grid.h b/applets/notification_area/na-grid.h
index 9c8dd340..0506c3ec 100644
--- a/applets/notification_area/na-grid.h
+++ b/applets/notification_area/na-grid.h
@@ -31,6 +31,11 @@
 #include <gdk/gdkx.h>
 #endif
 
+#ifndef HAVE_X11
+#include <gdk/gdkwayland.h>
+#define GDK_IS_X11_DISPLAY(object)        !(G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WAYLAND_DISPLAY))
+#endif
+
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS