From 6e83d1f54ec56459fc93d07571606d777e7a546e Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 30 Jul 2020 14:28:59 +0200
Subject: [PATCH] gtkwindowhandle: Avoid gdk_device_get_associated_device()

Query the seat for that.
---
 gtk/gtkwindowhandle.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gtk/gtkwindowhandle.c b/gtk/gtkwindowhandle.c
index 4818f78bc6..1792f5c47f 100644
--- a/gtk/gtkwindowhandle.c
+++ b/gtk/gtkwindowhandle.c
@@ -157,6 +157,7 @@ do_popup_fallback (GtkWindowHandle *self,
 {
   GdkRectangle rect = { 0, 0, 1, 1 };
   GdkDevice *device;
+  GdkSeat *seat;
   GtkWidget *box, *menuitem;
   GtkWindow *window;
   gboolean maximized, resizable, deletable;
@@ -186,9 +187,10 @@ do_popup_fallback (GtkWindowHandle *self,
 
 
   device = gdk_event_get_device (event);
+  seat = gdk_event_get_seat (event);
 
-  if (device && gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
-    device = gdk_device_get_associated_device (device);
+  if (device == gdk_seat_get_keyboard (seat))
+    device = gdk_seat_get_pointer (seat);
 
   if (device)
     {