chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tree-wide: add SD_ID128_MAKE_STR, remove LOG_MESSAGE_ID
[elogind.git]
/
src
/
login
/
logind-session.c
diff --git
a/src/login/logind-session.c
b/src/login/logind-session.c
index 9123d50fac012d0e9a24666316ae5c145ebc0608..bd2aac99a3351d3ebae4bc410d382c72fd99efe2 100644
(file)
--- a/
src/login/logind-session.c
+++ b/
src/login/logind-session.c
@@
-35,7
+35,7
@@
#include "escape.h"
#include "fd-util.h"
#include "fileio.h"
#include "escape.h"
#include "fd-util.h"
#include "fileio.h"
-#include "format
s
-util.h"
+#include "format-util.h"
#include "io-util.h"
#include "logind-session.h"
#include "mkdir.h"
#include "io-util.h"
#include "logind-session.h"
#include "mkdir.h"
@@
-592,7
+592,7
@@
int session_start(Session *s) {
return r;
log_struct(s->class == SESSION_BACKGROUND ? LOG_DEBUG : LOG_INFO,
return r;
log_struct(s->class == SESSION_BACKGROUND ? LOG_DEBUG : LOG_INFO,
-
LOG_MESSAGE_ID(SD_MESSAGE_SESSION_START)
,
+
"MESSAGE_ID=" SD_MESSAGE_SESSION_START_STR
,
"SESSION_ID=%s", s->id,
"USER_ID=%s", s->user->name,
"LEADER="PID_FMT, s->leader,
"SESSION_ID=%s", s->id,
"USER_ID=%s", s->user->name,
"LEADER="PID_FMT, s->leader,
@@
-617,12
+617,10
@@
int session_start(Session *s) {
/* Send signals */
session_send_signal(s, true);
/* Send signals */
session_send_signal(s, true);
- user_send_changed(s->user, "
Sessions", "
Display", NULL);
+ user_send_changed(s->user, "Display", NULL);
if (s->seat) {
if (s->seat->active == s)
if (s->seat) {
if (s->seat->active == s)
- seat_send_changed(s->seat, "Sessions", "ActiveSession", NULL);
- else
- seat_send_changed(s->seat, "Sessions", NULL);
+ seat_send_changed(s->seat, "ActiveSession", NULL);
}
return 0;
}
return 0;
@@
-720,7
+718,7
@@
int session_finalize(Session *s) {
if (s->started)
log_struct(s->class == SESSION_BACKGROUND ? LOG_DEBUG : LOG_INFO,
if (s->started)
log_struct(s->class == SESSION_BACKGROUND ? LOG_DEBUG : LOG_INFO,
-
LOG_MESSAGE_ID(SD_MESSAGE_SESSION_STOP)
,
+
"MESSAGE_ID=" SD_MESSAGE_SESSION_STOP_STR
,
"SESSION_ID=%s", s->id,
"USER_ID=%s", s->user->name,
"LEADER="PID_FMT, s->leader,
"SESSION_ID=%s", s->id,
"USER_ID=%s", s->user->name,
"LEADER="PID_FMT, s->leader,
@@
-750,11
+748,10
@@
int session_finalize(Session *s) {
seat_set_active(s->seat, NULL);
seat_save(s->seat);
seat_set_active(s->seat, NULL);
seat_save(s->seat);
- seat_send_changed(s->seat, "Sessions", NULL);
}
user_save(s->user);
}
user_save(s->user);
- user_send_changed(s->user, "
Sessions", "
Display", NULL);
+ user_send_changed(s->user, "Display", NULL);
return 0;
}
return 0;
}