summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Wold <[email protected]>2019-01-22 08:40:49 -0500
committerraveit65 <[email protected]>2019-01-29 15:20:59 +0100
commitd7edd93f04f56bcf60e31096593cd60653726fe0 (patch)
treeba56806c1ce65d2d09b6a9a9430baa4af774fa0f
parent3630b204548036d02abc663509b33ebe5797b3b3 (diff)
downloadmate-panel-d7edd93f04f56bcf60e31096593cd60653726fe0.tar.bz2
mate-panel-d7edd93f04f56bcf60e31096593cd60653726fe0.tar.xz
Notification area: error if compiling without X11 support
-rw-r--r--applets/notification_area/main.c10
-rw-r--r--applets/notification_area/na-grid.h5
-rw-r--r--applets/notification_area/system-tray/na-tray-child.c9
-rw-r--r--applets/notification_area/system-tray/na-tray-child.h7
-rw-r--r--applets/notification_area/system-tray/na-tray-manager.c5
-rw-r--r--applets/notification_area/system-tray/na-tray.c5
-rw-r--r--applets/notification_area/system-tray/na-tray.h4
7 files changed, 43 insertions, 2 deletions
diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
index 8d97ee59..8f8db2ff 100644
--- a/applets/notification_area/main.c
+++ b/applets/notification_area/main.c
@@ -22,6 +22,11 @@
*/
#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>
@@ -496,6 +501,11 @@ applet_factory (MatePanelApplet *applet,
strcmp (iid, "SystemTrayApplet") == 0))
return FALSE;
+ if (!GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (applet)))) {
+ g_warning ("Notification area only works on X");
+ return FALSE;
+ }
+
#ifndef NOTIFICATION_AREA_INPROCESS
gtk_window_set_default_icon_name (NOTIFICATION_AREA_ICON);
#endif
diff --git a/applets/notification_area/na-grid.h b/applets/notification_area/na-grid.h
index 7ddcc23c..9c8dd340 100644
--- a/applets/notification_area/na-grid.h
+++ b/applets/notification_area/na-grid.h
@@ -25,9 +25,12 @@
#ifndef NA_GRID_H
#define NA_GRID_H
-#ifdef GDK_WINDOWING_X11
+#include <config.h>
+
+#ifdef HAVE_X11
#include <gdk/gdkx.h>
#endif
+
#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/applets/notification_area/system-tray/na-tray-child.c b/applets/notification_area/system-tray/na-tray-child.c
index 047ce517..2f8549ac 100644
--- a/applets/notification_area/system-tray/na-tray-child.c
+++ b/applets/notification_area/system-tray/na-tray-child.c
@@ -20,6 +20,11 @@
*/
#include <config.h>
+
+#ifndef HAVE_X11
+#error file should only be built when HAVE_X11 is enabled
+#endif
+
#include <string.h>
#include "na-tray-child.h"
@@ -417,6 +422,10 @@ na_tray_child_new (GdkScreen *screen,
*/
display = gdk_screen_get_display (screen);
+ if (!GDK_IS_X11_DISPLAY (display)) {
+ g_warning ("na_tray only works on X11");
+ return NULL;
+ }
gdk_x11_display_error_trap_push (display);
result = XGetWindowAttributes (xdisplay, icon_window,
&window_attributes);
diff --git a/applets/notification_area/system-tray/na-tray-child.h b/applets/notification_area/system-tray/na-tray-child.h
index 6641fe88..aa39658a 100644
--- a/applets/notification_area/system-tray/na-tray-child.h
+++ b/applets/notification_area/system-tray/na-tray-child.h
@@ -23,7 +23,14 @@
#ifndef __NA_TRAY_CHILD_H__
#define __NA_TRAY_CHILD_H__
+#include <config.h>
+
+#ifndef HAVE_X11
+#error file should only be included when HAVE_X11 is enabled
+#endif
+
#include <gtk/gtk.h>
+
#include <gdk/gdkx.h>
#include <gtk/gtkx.h>
diff --git a/applets/notification_area/system-tray/na-tray-manager.c b/applets/notification_area/system-tray/na-tray-manager.c
index 3886a10d..4e137b25 100644
--- a/applets/notification_area/system-tray/na-tray-manager.c
+++ b/applets/notification_area/system-tray/na-tray-manager.c
@@ -21,6 +21,11 @@
*/
#include <config.h>
+
+#ifndef HAVE_X11
+#error file should only be built when HAVE_X11 is enabled
+#endif
+
#include <string.h>
#include <libintl.h>
diff --git a/applets/notification_area/system-tray/na-tray.c b/applets/notification_area/system-tray/na-tray.c
index 621d534d..bbf380c2 100644
--- a/applets/notification_area/system-tray/na-tray.c
+++ b/applets/notification_area/system-tray/na-tray.c
@@ -21,6 +21,11 @@
*/
#include <config.h>
+
+#ifndef HAVE_X11
+#error file should only be built when HAVE_X11 is enabled
+#endif
+
#include <string.h>
#include <gtk/gtk.h>
diff --git a/applets/notification_area/system-tray/na-tray.h b/applets/notification_area/system-tray/na-tray.h
index 8eaca36e..9f9d2bef 100644
--- a/applets/notification_area/system-tray/na-tray.h
+++ b/applets/notification_area/system-tray/na-tray.h
@@ -24,7 +24,9 @@
#ifndef __NA_TRAY_H__
#define __NA_TRAY_H__
-#ifdef GDK_WINDOWING_X11
+#include <config.h>
+
+#ifdef HAVE_X11
#include <gdk/gdkx.h>
#endif
#include <gtk/gtk.h>