From a4db61d3e452cfefa493871c338c2bac57d2578c Mon Sep 17 00:00:00 2001 From: Sebastian Wick Date: Tue, 12 Nov 2024 17:40:30 +0100 Subject: [PATCH] backend/native: Remove meta_backend_native_get_seat_id The last user of it was udev but it now goes through the launcher so we can remove it. Part-of: --- src/backends/native/meta-backend-native.c | 42 +++++++++++------------ src/backends/native/meta-backend-native.h | 2 -- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c index ec6de8fc7..345aa4117 100644 --- a/src/backends/native/meta-backend-native.c +++ b/src/backends/native/meta-backend-native.c @@ -124,6 +124,26 @@ meta_backend_native_create_clutter_backend (MetaBackend *backend, return CLUTTER_BACKEND (meta_clutter_backend_native_new (backend, context)); } +static const char * +get_seat_id (MetaBackendNative *backend_native) +{ + MetaBackendNativePrivate *priv = + meta_backend_native_get_instance_private (backend_native); + MetaLauncher *launcher = + meta_backend_get_launcher (META_BACKEND (backend_native)); + + switch (priv->mode) + { + case META_BACKEND_NATIVE_MODE_DEFAULT: + case META_BACKEND_NATIVE_MODE_TEST_VKMS: + return meta_launcher_get_seat_id (launcher); + case META_BACKEND_NATIVE_MODE_HEADLESS: + case META_BACKEND_NATIVE_MODE_TEST_HEADLESS: + return "seat0"; + } + g_assert_not_reached (); +} + static ClutterSeat * meta_backend_native_create_default_seat (MetaBackend *backend, GError **error) @@ -141,7 +161,7 @@ meta_backend_native_create_default_seat (MetaBackend *backend, case META_BACKEND_NATIVE_MODE_DEFAULT: case META_BACKEND_NATIVE_MODE_HEADLESS: case META_BACKEND_NATIVE_MODE_TEST_HEADLESS: - seat_id = meta_backend_native_get_seat_id (backend_native); + seat_id = get_seat_id (backend_native); break; case META_BACKEND_NATIVE_MODE_TEST_VKMS: seat_id = META_BACKEND_TEST_INPUT_SEAT; @@ -334,26 +354,6 @@ meta_backend_native_lock_layout_group (MetaBackend *backend, meta_backend_notify_keymap_layout_group_changed (backend, idx); } -const char * -meta_backend_native_get_seat_id (MetaBackendNative *backend_native) -{ - MetaBackendNativePrivate *priv = - meta_backend_native_get_instance_private (backend_native); - MetaLauncher *launcher = - meta_backend_get_launcher (META_BACKEND (backend_native)); - - switch (priv->mode) - { - case META_BACKEND_NATIVE_MODE_DEFAULT: - case META_BACKEND_NATIVE_MODE_TEST_VKMS: - return meta_launcher_get_seat_id (launcher); - case META_BACKEND_NATIVE_MODE_HEADLESS: - case META_BACKEND_NATIVE_MODE_TEST_HEADLESS: - return "seat0"; - } - g_assert_not_reached (); -} - static gboolean meta_backend_native_is_headless (MetaBackend *backend) { diff --git a/src/backends/native/meta-backend-native.h b/src/backends/native/meta-backend-native.h index 47a42e88f..c3f363592 100644 --- a/src/backends/native/meta-backend-native.h +++ b/src/backends/native/meta-backend-native.h @@ -45,5 +45,3 @@ MetaLauncher * meta_backend_native_get_launcher (MetaBackendNative *native); META_EXPORT_TEST MetaKms * meta_backend_native_get_kms (MetaBackendNative *native); - -const char * meta_backend_native_get_seat_id (MetaBackendNative *backend_native);