From c5da579cda3855ed78b6a2b43f8ca5ceab367596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Wed, 25 Aug 2021 12:17:47 +0200
Subject: [PATCH] window: Make sure we call gdk_wayland_surface_focus

When using xdg_activation this is responsible for submitting
the activation token / startup id to the compositor.
---
 gtk/gtkwindow.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index c1673df637..a658471c12 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5271,14 +5271,15 @@ gtk_window_present_with_time (GtkWindow *window,
 #endif
 	    timestamp = gtk_get_current_event_time ();
         }
-
-      gdk_toplevel_focus (GDK_TOPLEVEL (surface), timestamp);
     }
   else
     {
       priv->initial_timestamp = timestamp;
       gtk_widget_show (widget);
     }
+
+  g_assert (priv->surface != NULL);
+  gdk_toplevel_focus (GDK_TOPLEVEL (priv->surface), timestamp);
 }
 
 /**