chiark / gitweb /
fixes to the dbus code to make GetAll() in the properties iface work
authorLennart Poettering <lennart@poettering.net>
Mon, 1 Feb 2010 11:44:35 +0000 (12:44 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 1 Feb 2010 11:44:35 +0000 (12:44 +0100)
dbus-unit.c
dbus.c

index 5988f96..d474082 100644 (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;
diff --git a/dbus.c b/dbus.c
index 1798721..84b8fbf 100644 (file)
--- 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;