summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2023-03-26 14:36:57 +0000
committerMatthias Clasen <mclasen@redhat.com>2023-03-26 14:36:57 +0000
commit3cdb6392102079d85ea38fa24d58c1824fe4dd37 (patch)
treee146a013dcb962710d9d3f56ba7a00be7634eb94
parenta70b85ef76675fb12b617f9fc1e3b2f6d8c928b5 (diff)
parent3a5282abe1aabebef7d276a01a36f7512cab4b9b (diff)
downloadgtk+-3cdb6392102079d85ea38fa24d58c1824fe4dd37.tar.gz
Merge branch 'wayland-startup-notification-crash' into 'main'
wayland: Don't crash without xdg_activation_v1 Closes #5701 See merge request GNOME/gtk!5724
-rw-r--r--gdk/wayland/gdktoplevel-wayland.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk/wayland/gdktoplevel-wayland.c b/gdk/wayland/gdktoplevel-wayland.c
index c198477612..af201ac8f0 100644
--- a/gdk/wayland/gdktoplevel-wayland.c
+++ b/gdk/wayland/gdktoplevel-wayland.c
@@ -991,7 +991,7 @@ gdk_wayland_toplevel_set_startup_id (GdkWaylandToplevel *toplevel,
startup_id = free_me;
}
- if (startup_id)
+ if (display->xdg_activation && startup_id)
xdg_activation_v1_activate (display->xdg_activation,
startup_id,
surface->display_server.wl_surface);