From e68a8a0a174b9a7c2c963dbed68000079741a4ee Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Mon, 22 Jan 2024 17:10:00 +0100 Subject: [PATCH] core/launch-context: Guard X11 calls Also make use of display where possible to avoid a warning about an unused display variable if one tries to build without x11 Part-of: --- src/core/meta-launch-context.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core/meta-launch-context.c b/src/core/meta-launch-context.c index d7fc7335f..9d4b51eff 100644 --- a/src/core/meta-launch-context.c +++ b/src/core/meta-launch-context.c @@ -23,7 +23,10 @@ #include "core/display-private.h" #include "meta/meta-launch-context.h" + +#ifdef HAVE_X11_CLIENT #include "x11/meta-startup-notification-x11.h" +#endif typedef struct _MetaLaunchContext MetaLaunchContext; @@ -135,6 +138,7 @@ meta_launch_context_get_startup_notify_id (GAppLaunchContext *launch_context, if (context->workspace) workspace_idx = meta_workspace_index (context->workspace); +#ifdef HAVE_X11_CLIENT if (display->x11_display) { /* If there is a X11 display, we prefer going entirely through @@ -148,6 +152,7 @@ meta_launch_context_get_startup_notify_id (GAppLaunchContext *launch_context, context->timestamp, workspace_idx); } +#endif if (!startup_id) { @@ -166,7 +171,7 @@ meta_launch_context_get_startup_notify_id (GAppLaunchContext *launch_context, g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info)); } - sn = meta_display_get_startup_notification (context->display); + sn = meta_display_get_startup_notification (display); seq = g_object_new (META_TYPE_STARTUP_SEQUENCE, "display", context->display, "id", startup_id,