diff options
| author | William Wold <[email protected]> | 2019-01-22 08:40:49 -0500 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-01-29 15:20:59 +0100 |
| commit | d7edd93f04f56bcf60e31096593cd60653726fe0 (patch) | |
| tree | ba56806c1ce65d2d09b6a9a9430baa4af774fa0f /applets/notification_area/system-tray | |
| parent | 3630b204548036d02abc663509b33ebe5797b3b3 (diff) | |
| download | mate-panel-d7edd93f04f56bcf60e31096593cd60653726fe0.tar.bz2 mate-panel-d7edd93f04f56bcf60e31096593cd60653726fe0.tar.xz | |
Notification area: error if compiling without X11 support
Diffstat (limited to 'applets/notification_area/system-tray')
5 files changed, 29 insertions, 1 deletions
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> |