[mutter/bilelmoussaoui/x11-build-guards-2: 38/42] context/launch: Guard X11 types
- From: Bilal Elmoussaoui <bilelmoussaoui src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/bilelmoussaoui/x11-build-guards-2: 38/42] context/launch: Guard X11 types
- Date: Tue, 2 Aug 2022 07:35:57 +0000 (UTC)
commit e12da31882153682beb5d4e4c210df9509ba347f
Author: Bilal Elmoussaoui <belmouss redhat com>
Date: Fri Jun 17 11:03:43 2022 +0200
context/launch: Guard X11 types
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 984338c1b0..660599c9be 100644
--- a/src/core/meta-launch-context.c
+++ b/src/core/meta-launch-context.c
@@ -25,7 +25,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;
@@ -143,6 +146,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
@@ -156,6 +160,7 @@ meta_launch_context_get_startup_notify_id (GAppLaunchContext *launch_context,
context->timestamp,
workspace_idx);
}
+#endif
if (!startup_id)
{
@@ -174,7 +179,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,
"id", startup_id,
"application-id", application_id,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]