Skip to content

Commit 4fe2b74

Browse files
wmwwlukefromdc
authored andcommitted
panel-force-quit: Error if used when X11 is disabled
1 parent db9a60c commit 4fe2b74

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

mate-panel/panel-force-quit.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424

2525
#include <config.h>
2626

27+
#ifndef HAVE_X11
28+
#error file should only be built when HAVE_X11 is enabled
29+
#endif
30+
2731
#include "panel-force-quit.h"
2832

2933
#include <glib/gi18n.h>
@@ -335,6 +339,8 @@ panel_force_quit (GdkScreen *screen,
335339
GdkDisplay *display;
336340
GdkSeat *seat;
337341

342+
g_return_if_fail (GDK_IS_X11_DISPLAY (gdk_screen_get_display (screen)));
343+
338344
popup = display_popup_window (screen);
339345

340346
root = gdk_screen_get_root_window (screen);

mate-panel/panel-force-quit.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
#ifndef __PANEL_FORCE_QUIT_H__
2626
#define __PANEL_FORCE_QUIT_H__
2727

28+
#ifdef PACKAGE_NAME // only check HAVE_X11 if config.h has been included
29+
#ifndef HAVE_X11
30+
#error file should only be included when HAVE_X11 is enabled
31+
#endif
32+
#endif
33+
2834
#include <gdk/gdk.h>
2935

3036
#ifdef __cplusplus

0 commit comments

Comments
 (0)