diff options
author | Matthias Clasen <mclasen@redhat.com> | 2023-03-01 17:09:56 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2023-03-01 17:09:56 +0000 |
commit | e2f2076bf2dbb76fe4083ab3d449e93e0c4f48a9 (patch) | |
tree | be2955ad391dca7fcf42143e5cf90389aaa70e87 | |
parent | a1f0d6428711f89e6846943485014c93ee22129d (diff) | |
parent | a3c604d5cc730676b06df644c9d5cc4759db18f7 (diff) | |
download | gtk+-e2f2076bf2dbb76fe4083ab3d449e93e0c4f48a9.tar.gz |
Merge branch 'wip/carlosg/activation-regression-fix-3-24' into 'gtk-3-24'
gtkwindow: Fix fallbacks through xdg_activation_v1
See merge request GNOME/gtk!5581
-rw-r--r-- | gtk/gtkwindow.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index e1b09a3658..39b01eeb66 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -6287,19 +6287,23 @@ gtk_window_notify_startup (GtkWindow *window) !GTK_IS_OFFSCREEN_WINDOW (window) && priv->type != GTK_WINDOW_POPUP) { + GdkWindow *gdk_window; + + gdk_window = _gtk_widget_get_window (GTK_WIDGET (window)); + /* Do we have a custom startup-notification id? */ if (priv->startup_id != NULL) { /* Make sure we have a "real" id */ if (!startup_id_is_fake (priv->startup_id)) - gdk_notify_startup_complete_with_id (priv->startup_id); + gdk_window_set_startup_id (gdk_window, priv->startup_id); g_free (priv->startup_id); priv->startup_id = NULL; } else { - gdk_notify_startup_complete (); + gdk_window_set_startup_id (gdk_window, NULL); } } } |