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

launcher: Pass fallback session/seat ID when in test mode

Browse Source 
When we test, we might not have a systemd session to rely on, and this
may cause some API we depend on to get various session related data to
not work properly. Avoid this issue by passing fallback values for these
when we're running in test mode.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2151>
This commit is contained in:
Jonas Ådahl
2021-12-11 00:28:37 +01:00
committed by Marge Bot
parent 8372af9cd7
commit 1cc786ffd3
3 changed files with 59 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -605,7 +605,23 @@ meta_backend_native_initable_init (GInitable *initable,
if (!meta_backend_is_headless (backend))
{
native->launcher = meta_launcher_new (error);
const char *session_id = NULL;
const char *seat_id = NULL;
switch (native->mode)
{
case META_BACKEND_NATIVE_MODE_DEFAULT:
break;
case META_BACKEND_NATIVE_MODE_HEADLESS:
g_assert_not_reached ();
break;
case META_BACKEND_NATIVE_MODE_TEST:
session_id = "dummy";
seat_id = "seat0";
break;
}
native->launcher = meta_launcher_new (session_id, seat_id, error);
if (!native->launcher)
return FALSE;
}