From c401a1e0eadd2c4155acede30d332949d09a5678 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 1 Feb 2010 12:44:35 +0100 Subject: [PATCH] fixes to the dbus code to make GetAll() in the properties iface work --- dbus-unit.c | 2 +- dbus.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbus-unit.c b/dbus-unit.c index 5988f961..d4740826 100644 --- a/dbus-unit.c +++ b/dbus-unit.c @@ -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; diff --git a/dbus.c b/dbus.c index 17987210..84b8fbf0 100644 --- a/dbus.c +++ b/dbus.c @@ -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; -- 2.39.5