chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v225: Applying various fixes and changes to src/libelogind/sd-bus that got lost...
[elogind.git]
/
src
/
login
/
logind-session-dbus.c
diff --git
a/src/login/logind-session-dbus.c
b/src/login/logind-session-dbus.c
index 3a7b1a0fb96010144f4a0e89301457dd2bdc10c1..b5ecc322f56e7fba9d6642a3b3e4e60daa6dc5a7 100644
(file)
--- a/
src/login/logind-session-dbus.c
+++ b/
src/login/logind-session-dbus.c
@@
-163,7
+163,7
@@
static int property_get_idle_since_hint(
sd_bus_error *error) {
Session *s = userdata;
sd_bus_error *error) {
Session *s = userdata;
- dual_timestamp t;
+ dual_timestamp t
= DUAL_TIMESTAMP_NULL
;
uint64_t u;
int r;
uint64_t u;
int r;
@@
-701,6
+701,9
@@
int session_send_create_reply(Session *s, sd_bus_error *error) {
if (!s->create_message)
return 0;
if (!s->create_message)
return 0;
+ if (!sd_bus_error_is_set(error) && (s->scope_job || s->user->service_job))
+ return 0;
+
c = s->create_message;
s->create_message = NULL;
c = s->create_message;
s->create_message = NULL;
@@
-711,8
+714,8
@@
int session_send_create_reply(Session *s, sd_bus_error *error) {
if (fifo_fd < 0)
return fifo_fd;
if (fifo_fd < 0)
return fifo_fd;
- /* Update the session and user state file
s before we notify
- *
the client
about the result. */
+ /* Update the session and user state file
before we notify the client
+ * about the result. */
session_save(s);
user_save(s->user);
session_save(s);
user_save(s->user);