Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Sebastian Keller
2020-01-27 01:02:29 +01:00
parent 5040d81e03
commit 9c6669be48
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gdk/x11/gdkdevicemanager-xi2.c
View File

@@ -685,12 +685,13 @@ remove_device (GdkX11DeviceManagerXI2 *device_manager,
if (device) if (device)
{ {
detach_from_seat (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, g_hash_table_remove (device_manager->id_table,
GINT_TO_POINTER (device_id)); 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);
} }
} }