diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-06-24 20:41:22 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-06-24 20:41:22 +0200 |
| commit | dec15e9263cadae02f4f51463860248af40475d0 (patch) | |
| tree | 2a3db8606d4596a3aac939ec4c81edfceb09ac84 | |
| parent | 19bc719ec28e731159671b06254d9bfd49014894 (diff) | |
logind: fix generation of bus arrays
| -rw-r--r-- | src/logind-dbus.c | 6 | ||||
| -rw-r--r-- | src/logind-seat-dbus.c | 2 | ||||
| -rw-r--r-- | src/logind-user-dbus.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/logind-dbus.c b/src/logind-dbus.c index 693906ef70..2a85749478 100644 --- a/src/logind-dbus.c +++ b/src/logind-dbus.c @@ -589,7 +589,7 @@ static DBusHandlerResult manager_message_handler( dbus_message_iter_init_append(reply, &iter); - if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "susso", &sub)) + if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(susso)", &sub)) goto oom; HASHMAP_FOREACH(session, m->sessions, i) { @@ -635,7 +635,7 @@ static DBusHandlerResult manager_message_handler( dbus_message_iter_init_append(reply, &iter); - if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "uso", &sub)) + if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(uso)", &sub)) goto oom; HASHMAP_FOREACH(user, m->users, i) { @@ -679,7 +679,7 @@ static DBusHandlerResult manager_message_handler( dbus_message_iter_init_append(reply, &iter); - if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "so", &sub)) + if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(so)", &sub)) goto oom; HASHMAP_FOREACH(seat, m->seats, i) { diff --git a/src/logind-seat-dbus.c b/src/logind-seat-dbus.c index ad0298e7a7..669e83e82d 100644 --- a/src/logind-seat-dbus.c +++ b/src/logind-seat-dbus.c @@ -102,7 +102,7 @@ static int bus_seat_append_sessions(DBusMessageIter *i, const char *property, vo assert(property); assert(s); - 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_seat, session, s->sessions) { diff --git a/src/logind-user-dbus.c b/src/logind-user-dbus.c index 6d7e8e7030..7263d1b757 100644 --- 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); - 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) { |