xwayland: Enable Xwayland on demand by default

Make "Xwayland on demand" the default policy when Xwayland supports
"initfd" and remove the corresponding experimental feature.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1673>
This commit is contained in:
Olivier Fourdan
2021-01-18 18:23:20 +01:00
parent 3fc603edd3
commit cde0cd5d23
4 changed files with 5 additions and 13 deletions

View File

@ -794,14 +794,12 @@ meta_get_x11_display_policy (void)
#ifdef HAVE_WAYLAND
if (meta_is_wayland_compositor ())
{
MetaSettings *settings = meta_backend_get_settings (backend);
if (opt_no_x11)
return META_DISPLAY_POLICY_DISABLED;
if (meta_settings_is_experimental_feature_enabled (settings,
META_EXPERIMENTAL_FEATURE_AUTOSTART_XWAYLAND))
return META_DISPLAY_POLICY_ON_DEMAND;
#ifdef HAVE_XWAYLAND_INITFD
return META_DISPLAY_POLICY_ON_DEMAND;
#endif
}
#endif