chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'harald/master'
[elogind.git]
/
src
/
logind-user-dbus.c
diff --git
a/src/logind-user-dbus.c
b/src/logind-user-dbus.c
index 623f2c9c24a044a7a659c5154c51643b3569af25..7263d1b757265ecc2504224a94524625b0a71a3f 100644
(file)
--- a/
src/logind-user-dbus.c
+++ b/
src/logind-user-dbus.c
@@
-121,7
+121,7
@@
static int bus_user_append_sessions(DBusMessageIter *i, const char *property, vo
assert(property);
assert(u);
assert(property);
assert(u);
- if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "
so
", &sub))
+ if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "
(so)
", &sub))
return -ENOMEM;
LIST_FOREACH(sessions_by_user, session, u->sessions) {
return -ENOMEM;
LIST_FOREACH(sessions_by_user, session, u->sessions) {
@@
-154,13
+154,14
@@
static int bus_user_append_sessions(DBusMessageIter *i, const char *property, vo
static int bus_user_append_idle_hint(DBusMessageIter *i, const char *property, void *data) {
User *u = data;
static int bus_user_append_idle_hint(DBusMessageIter *i, const char *property, void *data) {
User *u = data;
-
bool
b;
+
dbus_bool_t
b;
assert(i);
assert(property);
assert(u);
assert(i);
assert(property);
assert(u);
- b = user_get_idle_hint(u, NULL);
+ b = user_get_idle_hint(u, NULL) > 0;
+
if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b))
return -ENOMEM;
if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b))
return -ENOMEM;
@@
-361,6
+362,9
@@
int user_send_changed(User *u, const char *properties) {
assert(u);
assert(u);
+ if (!u->started)
+ return 0;
+
p = user_bus_path(u);
if (!p)
return -ENOMEM;
p = user_bus_path(u);
if (!p)
return -ENOMEM;