From 86ad3bc1ce5a6e4d007aaa390f6f7551ff7c9696 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 2 Feb 2010 12:42:34 +0100 Subject: [PATCH] dbus: hand out proper dbus object paths for jobs --- dbus-unit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dbus-unit.c b/dbus-unit.c index eef1b644..0bdf1620 100644 --- a/dbus-unit.c +++ b/dbus-unit.c @@ -146,7 +146,7 @@ static int bus_unit_append_job(Manager *m, DBusMessageIter *i, const char *prope return -ENOMEM; if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_UINT32, &u->meta.job->id) || - !dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &p)) { + !dbus_message_iter_append_basic(&sub, DBUS_TYPE_OBJECT_PATH, &p)) { free(p); return -ENOMEM; } @@ -161,7 +161,7 @@ static int bus_unit_append_job(Manager *m, DBusMessageIter *i, const char *prope return -ENOMEM; if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_UINT32, &id) || - !dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &p)) { + !dbus_message_iter_append_basic(&sub, DBUS_TYPE_OBJECT_PATH, &p)) { free(p); return -ENOMEM; } @@ -187,7 +187,7 @@ static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusMessage *message { "org.freedesktop.systemd1.Unit", "ActiveExitTimestamp", bus_property_append_uint64, "t", &u->meta.active_exit_timestamp }, { "org.freedesktop.systemd1.Unit", "CanReload", bus_unit_append_can_reload, "b", u }, { "org.freedesktop.systemd1.Unit", "CanStart", bus_unit_append_can_start, "b", u }, - { "org.freedesktop.systemd1.Unit", "Job", bus_unit_append_job, "(us)", u, }, + { "org.freedesktop.systemd1.Unit", "Job", bus_unit_append_job, "(uo)", u }, { NULL, NULL, NULL, NULL, NULL } }; -- 2.39.5