From f71706058d30680542c28ca03d4be6a35b03124b Mon Sep 17 00:00:00 2001 From: Ivan Podogov Date: Fri, 24 Feb 2023 21:01:54 +0100 Subject: Allow wayland sessions to pass validation. This makes slick-greeter properly remember the last wayland session instead of defaulting to an xsession. --- src/arctica-greeter.vala | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/arctica-greeter.vala') diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala index 077f07d..08a8b8e 100644 --- a/src/arctica-greeter.vala +++ b/src/arctica-greeter.vala @@ -224,6 +224,13 @@ public class ArcticaGreeter : Object } } + foreach (string session in sessions) { + var path = Path.build_filename ("/usr/share/wayland-sessions/", session.concat(".desktop"), null); + if (FileUtils.test (path, FileTest.EXISTS)) { + return session; + } + } + warning ("Could not find a default session."); return null; } @@ -235,7 +242,8 @@ public class ArcticaGreeter : Object */ if (session != null) { var path = Path.build_filename ("/usr/share/xsessions/", session.concat(".desktop"), null); - if (!FileUtils.test (path, FileTest.EXISTS) ) { + var waypath = Path.build_filename ("/usr/share/wayland-sessions/", session.concat(".desktop"), null); + if (!FileUtils.test (path, FileTest.EXISTS) & !FileUtils.test (waypath, FileTest.EXISTS)) { debug ("Invalid session: '%s'", session); session = null; } -- cgit v1.2.3