From a191af1f3d50f23e68f3af9e1f1742d46510609b Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Thu, 7 Dec 2023 16:12:15 +0100 Subject: [PATCH] remote-desktop/eis: Fix ConnectToEIS device-types The change to the device types in xdg-desktop-portal-gnome needs to be reflected in mutter as well, otherwise the device types are not properly passed along. As a result, input emulation fails. Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3194 See-also: https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/merge_requests/108/diffs?commit_id=2b3163a Part-of: --- src/backends/meta-remote-desktop-session.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backends/meta-remote-desktop-session.c b/src/backends/meta-remote-desktop-session.c index 9605c3c9b..ec7298ba2 100644 --- a/src/backends/meta-remote-desktop-session.c +++ b/src/backends/meta-remote-desktop-session.c @@ -1914,14 +1914,14 @@ handle_connect_to_eis (MetaDBusRemoteDesktopSession *skeleton, if (!session->eis) { - uint32_t device_types_bitmask; - MetaRemoteDesktopDeviceTypes device_types; + MetaRemoteDesktopDeviceTypes device_types = META_REMOTE_DESKTOP_DEVICE_TYPE_NONE; MetaEisDeviceTypes eis_device_types; + GVariant *v; - if (g_variant_lookup (arg_options, "device-types", "u", - &device_types_bitmask)) + v = g_variant_lookup_value (arg_options, "device-types", G_VARIANT_TYPE_UINT32); + if (v) { - device_types = device_types_bitmask; + device_types = g_variant_get_uint32 (v); } else {