AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 21:51:08 +00:00
Code Issues Projects Releases Wiki Activity

inspector: Fix teardown of the general tab

Browse Source 
We were connecting signal handlers to the display
and seats here, and never cleaning them up, leading
to crashes after the inspector is closed. This is
fairly easy to reproduce under Wayland, where the
scroll device is only created the first time we
create a scroll event.
This commit is contained in:
Matthias Clasen 2020-09-05 22:35:30 -04:00
parent 716c7b2f21
commit a4ba25f0f8
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gtk/inspector/general.c
View File

@ -817,6 +817,13 @@ add_seat (GtkInspectorGeneral *gen,
g_list_free (list);
}
static void
disconnect_seat (GtkInspectorGeneral *gen,
GdkSeat *seat)
{
g_signal_handlers_disconnect_by_func (seat, G_CALLBACK (populate_seats), gen);
}
static void
populate_seats (GtkInspectorGeneral *gen)
{
@ -835,11 +842,28 @@ populate_seats (GtkInspectorGeneral *gen)
g_list_free (list);
}
static void
seat_added (GdkDisplay *display,
GdkSeat *seat,
GtkInspectorGeneral *gen)
{
populate_seats (gen);
}
static void
seat_removed (GdkDisplay *display,
GdkSeat *seat,
GtkInspectorGeneral *gen)
{
disconnect_seat (gen, seat);
populate_seats (gen);
}
static void
init_device (GtkInspectorGeneral *gen)
{
g_signal_connect_swapped (gen->display, "seat-added", G_CALLBACK (populate_seats), gen);
g_signal_connect_swapped (gen->display, "seat-removed", G_CALLBACK (populate_seats), gen);
g_signal_connect (gen->display, "seat-added", G_CALLBACK (seat_added), gen);
g_signal_connect (gen->display, "seat-removed", G_CALLBACK (seat_removed), gen);
populate_seats (gen);
}
@ -911,9 +935,18 @@ static void
gtk_inspector_general_dispose (GObject *object)
{
GtkInspectorGeneral *gen = GTK_INSPECTOR_GENERAL (object);
GList *list, *l;
g_clear_pointer (&gen->swin, gtk_widget_unparent);
g_signal_handlers_disconnect_by_func (gen->display, G_CALLBACK (seat_added), gen);
g_signal_handlers_disconnect_by_func (gen->display, G_CALLBACK (seat_removed), gen);
list = gdk_display_list_seats (gen->display);
for (l = list; l; l = l->next)
disconnect_seat (gen, GDK_SEAT (l->data));
g_list_free (list);
G_OBJECT_CLASS (gtk_inspector_general_parent_class)->dispose (object);
}