From 537442f28135bdb08e16430ffdda17bec038a25e Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 24 Feb 2023 23:55:20 +0100
Subject: src/arctica-greeter.vala: Turn get_default_session() and
 validate_session() into non-static methods.

---
 src/arctica-greeter.vala | 6 +++---
 src/greeter-list.vala    | 4 +++-
 src/user-list.vala       | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala
index 68c8887..5de14dc 100644
--- a/src/arctica-greeter.vala
+++ b/src/arctica-greeter.vala
@@ -203,7 +203,7 @@ public class ArcticaGreeter : Object
         ctx.add_class ("lightdm");
     }
 
-    public static string? get_default_session ()
+    public string? get_default_session ()
     {
         var sessions = new List<string> ();
         sessions.append ("lightdm-xsession");
@@ -237,7 +237,7 @@ public class ArcticaGreeter : Object
         return null;
     }
 
-    public static string validate_session (string? session)
+    public string validate_session (string? session)
     {
         /* Make sure the given session actually exists. Return it if it does.
          * otherwise, return the default session.
@@ -252,7 +252,7 @@ public class ArcticaGreeter : Object
         }
 
         if (session == null) {
-            var default_session = ArcticaGreeter.get_default_session ();
+            var default_session = get_default_session ();
             debug ("Invalid session: '%s'. Using session '%s' instead.", session, default_session);
             return default_session;
         }
diff --git a/src/greeter-list.vala b/src/greeter-list.vala
index c574778..5d943ee 100644
--- a/src/greeter-list.vala
+++ b/src/greeter-list.vala
@@ -61,6 +61,7 @@ public abstract class GreeterList : FadableBox
     public bool start_scrolling { get; set; default = true; }
 
     protected string greeter_authenticating_user;
+    protected ArcticaGreeter greeter;
 
     protected bool _always_show_manual = false;
     public bool always_show_manual
@@ -964,7 +965,8 @@ public abstract class GreeterList : FadableBox
 
     protected virtual string get_lightdm_session ()
     {
-        return ArcticaGreeter.get_default_session ();
+        greeter = new ArcticaGreeter();
+        return greeter.get_default_session ();
     }
 
     /* Testing code below this */
diff --git a/src/user-list.vala b/src/user-list.vala
index 2f16924..39ed7ae 100644
--- a/src/user-list.vala
+++ b/src/user-list.vala
@@ -118,7 +118,7 @@ public class UserList : GreeterList
         {
             if (_default_session == "") {
                 var greeter = new ArcticaGreeter ();
-                _default_session = ArcticaGreeter.get_default_session();
+                _default_session = greeter.get_default_session();
                 debug ("Setting UserList._default_session to '%s'.", _default_session);
             }
             return _default_session;
@@ -900,7 +900,8 @@ public class UserList : GreeterList
         {
             session = default_session;
         }
-        e.session = ArcticaGreeter.validate_session(session);
+        greeter = new ArcticaGreeter();
+        e.session = greeter.validate_session(session);
         e.label = label;
         e.set_show_message_icon (has_messages);
         e.set_is_active (is_active);
-- 
cgit v1.2.3