[mutter] wayland: Tear down seat too when shutting down
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] wayland: Tear down seat too when shutting down
- Date: Wed, 5 May 2021 20:26:21 +0000 (UTC)
commit 1a43312b96615d3530301be2afd4b2f93a698cfa
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Mon Apr 12 14:57:27 2021 +0200
wayland: Tear down seat too when shutting down
The functionality was mostly there, but not hooked up to anything.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1822>
src/wayland/meta-wayland-seat.c | 4 ++++
src/wayland/meta-wayland.c | 2 ++
2 files changed, 6 insertions(+)
---
diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
index f32173a085..abc0b4ddae 100644
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -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);
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index c6225868e6..153d61954c 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -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);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]