summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2013-11-28 17:29:01 +0100
committerDavid Herrmann <dh.herrmann@gmail.com>2013-11-28 17:41:44 +0100
commit486cd82c8f7642016895b72bcc09a1bfe885a783 (patch)
treecb6fac4d2342b24daf66dd66b3894049b1a0f10f
parentc506027af881a9e4210845a7a8a6ec5910aa0f3b (diff)
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.
-rw-r--r--src/login/logind-dbus.c1
-rw-r--r--src/login/logind-session.c3
-rw-r--r--src/login/logind-session.h1
3 files changed, 0 insertions, 5 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 9538150e2e..a4bdf5f28c 100644
--- 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 &&
- !session->closing &&
session->user->uid != uid)
return true;
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index a72b13ee03..beaa60124f 100644
--- 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);
- if (s->closing)
- return SESSION_CLOSING;
-
if (s->scope_job)
return SESSION_OPENING;
diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index 939476af55..ee931013dd 100644
--- 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 closing:1;
sd_bus_message *create_message;