From 4cef9f34713d20d7d87c4485a789816325ddb80a Mon Sep 17 00:00:00 2001 From: Sebastian Keller Date: Mon, 27 Jan 2020 00:59:56 +0100 Subject: [PATCH 1/2] gdkseatdefault: Unref removed slave devices Adding a slave device adds a ref, but removing it does not unref it. https://gitlab.gnome.org/GNOME/gtk/merge_requests/1359 --- gdk/gdkseatdefault.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gdk/gdkseatdefault.c b/gdk/gdkseatdefault.c index a83901a692..98ea6335fa 100644 --- a/gdk/gdkseatdefault.c +++ b/gdk/gdkseatdefault.c @@ -396,6 +396,7 @@ gdk_seat_default_remove_slave (GdkSeatDefault *seat, priv->capabilities |= device_get_capability (GDK_DEVICE (l->data)); gdk_seat_device_removed (GDK_SEAT (seat), device); + g_object_unref (device); } else if (g_list_find (priv->slave_keyboards, device)) { @@ -405,6 +406,7 @@ gdk_seat_default_remove_slave (GdkSeatDefault *seat, priv->capabilities &= ~GDK_SEAT_CAPABILITY_KEYBOARD; gdk_seat_device_removed (GDK_SEAT (seat), device); + g_object_unref (device); } } From 9ce66b9d059e3552ca6feea171aa8541fc1a5cb3 Mon Sep 17 00:00:00 2001 From: Sebastian Keller Date: Mon, 27 Jan 2020 01:02:29 +0100 Subject: [PATCH 2/2] 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/1359 --- gdk/x11/gdkdevicemanager-xi2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c index 135a0512aa..00e64d2a84 100644 --- a/gdk/x11/gdkdevicemanager-xi2.c +++ b/gdk/x11/gdkdevicemanager-xi2.c @@ -643,14 +643,14 @@ remove_device (GdkX11DeviceManagerXI2 *device_manager, if (device) { detach_from_seat (device); - device_manager->devices = g_list_remove (device_manager->devices, device); - - g_signal_emit_by_name (device_manager, "device-removed", 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_signal_emit_by_name (device_manager, "device-removed", device); + g_object_run_dispose (G_OBJECT (device)); + g_object_unref (device); } }