[mutter] backends/x11: Pass the seat to the input settings
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] backends/x11: Pass the seat to the input settings
- Date: Wed, 10 Mar 2021 16:43:35 +0000 (UTC)
commit 8d008112b6f267c277561cb30eac4d3f0ef787fe
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date: Tue Mar 9 18:45:04 2021 +0100
backends/x11: Pass the seat to the input settings
Input settings requires a valid seat in order to initialize the a11y
settings (since commit 1609d145), however in X11 we never set it and
even if we create the input settings early (as per commit 7547891a) we
never initialize the seat for it.
This leads to startup critical errors on X11:
clutter_seat_get_pointer_a11y_settings: assertion
'CLUTTER_IS_SEAT (seat)' failed
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1763>
src/backends/x11/cm/meta-backend-x11-cm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/backends/x11/cm/meta-backend-x11-cm.c b/src/backends/x11/cm/meta-backend-x11-cm.c
index 3b39178e0d..b4f40754fd 100644
--- a/src/backends/x11/cm/meta-backend-x11-cm.c
+++ b/src/backends/x11/cm/meta-backend-x11-cm.c
@@ -92,14 +92,14 @@ meta_backend_x11_cm_post_init (MetaBackend *backend)
MetaBackendX11Cm *x11_cm = META_BACKEND_X11_CM (backend);
ClutterSeat *seat;
- x11_cm->input_settings = g_object_new (META_TYPE_INPUT_SETTINGS_X11, NULL);
-
- parent_backend_class->post_init (backend);
-
seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
g_signal_connect_object (seat, "device-added",
G_CALLBACK (on_device_added), backend, 0);
+ x11_cm->input_settings = g_object_new (META_TYPE_INPUT_SETTINGS_X11,
+ "seat", seat, NULL);
+
+ parent_backend_class->post_init (backend);
take_touch_grab (backend);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]