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

backend/native: Remove meta_backend_native_get_seat_id

Browse Source 
The last user of it was udev but it now goes through the launcher so we
can remove it.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4130>
This commit is contained in:
Sebastian Wick 2024-11-12 17:40:30 +01:00
parent 6d3d718684
commit a4db61d3e4
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/backends/native/meta-backend-native.c
View File

@ -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)
{

2
src/backends/native/meta-backend-native.h
View File

@ -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);