fixes to the dbus code to make GetAll() in the properties iface work

This commit is contained in:
Lennart Poettering 2010-02-01 12:44:35 +01:00
parent ea4309869e
commit c401a1e0ea
2 changed files with 2 additions and 2 deletions

View file

@ -30,7 +30,7 @@ static int bus_unit_append_id(Manager *m, DBusMessageIter *i, const char *proper
id = unit_id(u);
if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &u))
if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &id))
return -ENOMEM;
return 0;

2
dbus.c
View file

@ -436,7 +436,7 @@ DBusHandlerResult bus_default_message_handler(Manager *m, DBusMessage *message,
if (!streq(p->interface, interface))
continue;
if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, "sv" , &sub2) ||
if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, NULL, &sub2) ||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &p->property) ||
!dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, p->signature, &sub3))
goto oom;