From: Sebastian Keller <skeller@gnome.org>
Date: Mon, 27 Jan 2020 00:02:29 +0000 (+0100)
Subject: gdk/x11: Properly unref removed device in XI2 device manager
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~134^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9c6669be487c29335d25d11f2f50f5f32c203e3b;p=gtk4.git

gdk/x11: Properly unref removed device in XI2 device manager

When a device is added, there are two references to it by the device
manager, the initial one and the one used for the id_table. Removing a
device only removed the reference added by the id_table resulting in the
GdkDevice being leaked.

https://gitlab.gnome.org/GNOME/gtk/merge_requests/1358
---

diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 645e992c38..86bf669c8a 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -685,12 +685,13 @@ remove_device (GdkX11DeviceManagerXI2 *device_manager,
   if (device)
     {
       detach_from_seat (device);
-      device_manager->devices = g_list_remove (device_manager->devices, device);
-
-      g_object_run_dispose (G_OBJECT (device));
 
       g_hash_table_remove (device_manager->id_table,
                            GINT_TO_POINTER (device_id));
+
+      device_manager->devices = g_list_remove (device_manager->devices, device);
+      g_object_run_dispose (G_OBJECT (device));
+      g_object_unref (device);
     }
 }