logind: remove unused session->closing field

This field is always false, drop it. If you want a reliable way to get
session state, call session_get_state(). Testing for any flags directly
doesn't work currently so don't pretend it would.

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 9538150e2e548c6051a75357c5d5e95f3056d64e..a4bdf5f28cf9cc8e19e69c471f32c2c4984a48c1 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1252,7 +1252,6 @@ static int have_multiple_sessions(
          * count, and non-login sessions do not count either. */
         HASHMAP_FOREACH(session, m->sessions, i)
                 if (session->class == SESSION_USER &&
          * count, and non-login sessions do not count either. */
         HASHMAP_FOREACH(session, m->sessions, i)
                 if (session->class == SESSION_USER &&

-                    !session->closing &&

                     session->user->uid != uid)
                         return true;
 
                     session->user->uid != uid)
                         return true;
 

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index a72b13ee0363c3826836706c36c4f4dd64439c00..beaa60124f7c6b86300f1daa01e2cd2ccd830b0a 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -954,9 +954,6 @@ void session_add_to_gc_queue(Session *s) {
 SessionState session_get_state(Session *s) {
         assert(s);
 
 SessionState session_get_state(Session *s) {
         assert(s);
 

-        if (s->closing)
-                return SESSION_CLOSING;
-

         if (s->scope_job)
                 return SESSION_OPENING;
 
         if (s->scope_job)
                 return SESSION_OPENING;
 

diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index 939476af557d8ac7c732067458164d11f4fcad30..ee931013dd9cbdc01e76779bbe0508c3da8a56d8 100644 (file)
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -107,7 +107,6 @@ struct Session {
 
         bool in_gc_queue:1;
         bool started:1;
 
         bool in_gc_queue:1;
         bool started:1;

-        bool closing:1;

 
         sd_bus_message *create_message;
 
 
         sd_bus_message *create_message;