chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move bus_error to dbus-common and remove bus_error_message_or_strerror
[elogind.git]
/
src
/
login
/
logind-session.c
diff --git
a/src/login/logind-session.c
b/src/login/logind-session.c
index 97c24d094b66ef2ee97b5c9861c38c2a14848564..2f7ab3451fb806c0166f2ea46d97d569b38eab50 100644
(file)
--- a/
src/login/logind-session.c
+++ b/
src/login/logind-session.c
@@
-436,15
+436,14
@@
static int session_create_one_group(Session *s, const char *controller, const ch
int r;
assert(s);
int r;
assert(s);
- assert(controller);
assert(path);
if (s->leader > 0) {
r = cg_create_and_attach(controller, path, s->leader);
if (r < 0)
assert(path);
if (s->leader > 0) {
r = cg_create_and_attach(controller, path, s->leader);
if (r < 0)
- r = cg_create(controller, path);
+ r = cg_create(controller, path
, NULL
);
} else
} else
- r = cg_create(controller, path);
+ r = cg_create(controller, path
, NULL
);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-710,6
+709,8
@@
int session_stop(Session *s) {
if (s->started)
session_send_signal(s, false);
if (s->started)
session_send_signal(s, false);
+ s->started = false;
+
if (s->seat) {
if (s->seat->active == s)
seat_set_active(s->seat, NULL);
if (s->seat) {
if (s->seat->active == s)
seat_set_active(s->seat, NULL);
@@
-721,8
+722,6
@@
int session_stop(Session *s) {
user_send_changed(s->user, "Sessions\0");
user_save(s->user);
user_send_changed(s->user, "Sessions\0");
user_save(s->user);
- s->started = false;
-
return r;
}
return r;
}
@@
-1056,7
+1055,8
@@
DEFINE_STRING_TABLE_LOOKUP(session_type, SessionType);
static const char* const session_class_table[_SESSION_CLASS_MAX] = {
[SESSION_USER] = "user",
[SESSION_GREETER] = "greeter",
static const char* const session_class_table[_SESSION_CLASS_MAX] = {
[SESSION_USER] = "user",
[SESSION_GREETER] = "greeter",
- [SESSION_LOCK_SCREEN] = "lock-screen"
+ [SESSION_LOCK_SCREEN] = "lock-screen",
+ [SESSION_BACKGROUND] = "background"
};
DEFINE_STRING_TABLE_LOOKUP(session_class, SessionClass);
};
DEFINE_STRING_TABLE_LOOKUP(session_class, SessionClass);