Make libx11 optional, guard x11 code paths

It's not clear whether libwnck-based functionality will ever have a
counterpart on Wayland, so it seems pointless to replace libwnck with
libxfce4windowing at this stage.

Completes: ecd1e1a645
Related: #75, #78
This commit is contained in:
Gaël Bonithon
2023-09-05 17:01:23 +02:00
parent 0a155096e5
commit 30185130f2
7 changed files with 34 additions and 17 deletions

View File

@@ -25,6 +25,9 @@
#include <glib-object.h>
#include <glib.h>
#include <glib/gi18n.h>
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#endif
#include "settings.h"
@@ -155,8 +158,11 @@ void
xtm_settings_bind_xfconf (XtmSettings *settings, XfconfChannel *channel)
{
/* general settings */
xfconf_g_property_bind (channel, SETTING_SHOW_STATUS_ICON, G_TYPE_BOOLEAN,
G_OBJECT (settings), "show-status-icon");
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
xfconf_g_property_bind (channel, SETTING_SHOW_STATUS_ICON, G_TYPE_BOOLEAN,
G_OBJECT (settings), "show-status-icon");
#endif
xfconf_g_property_bind (channel, SETTING_PROMPT_TERMINATE_TASK, G_TYPE_BOOLEAN,
G_OBJECT (settings), "prompt-terminate-task");