AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'gdk-device-leak-fix' into 'master'

Browse Source 
GdkDevice leak fix

See merge request GNOME/gtk!1358
This commit is contained in:
Matthias Clasen 2020-01-29 10:44:42 +00:00
commit 83cccfc984
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/gdkseatdefault.c
View File

@ -417,6 +417,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))
{
@ -427,6 +428,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);
}
}

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

@ -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);
}
}