brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Tear down seat too when shutting down

Browse Source 
The functionality was mostly there, but not hooked up to anything.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1822>
This commit is contained in:
Jonas Ådahl 2021-04-12 14:57:27 +02:00 committed by Marge Bot
parent 9827687ca1
commit 1a43312b96
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wayland/meta-wayland-seat.c
View File

@ -273,9 +273,13 @@ meta_wayland_seat_free (MetaWaylandSeat *seat)
g_signal_handlers_disconnect_by_data (clutter_seat, seat);
meta_wayland_seat_set_capabilities (seat, 0);
meta_wayland_pointer_disable (seat->pointer);
g_object_unref (seat->pointer);
meta_wayland_keyboard_disable (seat->keyboard);
g_object_unref (seat->keyboard);
meta_wayland_touch_disable (seat->touch);
g_object_unref (seat->touch);
meta_wayland_gtk_text_input_destroy (seat->gtk_text_input);
meta_wayland_text_input_destroy (seat->text_input);

2
src/wayland/meta-wayland.c
View File

@ -595,6 +595,8 @@ meta_wayland_finalize (void)
if (compositor->wayland_display)
wl_display_destroy_clients (compositor->wayland_display);
meta_wayland_seat_free (compositor->seat);
g_clear_pointer (&compositor->display_name, g_free);
g_clear_pointer (&compositor->wayland_display, wl_display_destroy);
}