X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus-path.c;h=6155792d0dd8f13ee45c69920157761430142051;hp=c8c302ab3737cbbd91539abe7e2312c0cfd78400;hb=2b590e135f53a1bd3e771bdc555f7bf28c4cd232;hpb=c4e2ceae941d02de5574becbfd3b4db15de2eda3

diff --git a/src/dbus-path.c b/src/dbus-path.c
index c8c302ab3..6155792d0 100644
--- a/src/dbus-path.c
+++ b/src/dbus-path.c
@@ -41,7 +41,7 @@
         BUS_INTROSPECTABLE_INTERFACE                                    \
         "</node>\n"
 
-const char bus_path_interface[] = BUS_PATH_INTERFACE;
+const char bus_path_interface[] _introspect_("Path") = BUS_PATH_INTERFACE;
 
 static int bus_path_append_paths(Manager *m, DBusMessageIter *i, const char *property, void *data) {
         Path *p = data;
@@ -72,10 +72,24 @@ static int bus_path_append_paths(Manager *m, DBusMessageIter *i, const char *pro
         return 0;
 }
 
+static int bus_path_append_unit(Manager *m, DBusMessageIter *i, const char *property, void *data) {
+        Unit *u = data;
+        const char *t;
+
+        assert(m);
+        assert(i);
+        assert(property);
+        assert(u);
+
+        t = u->path.unit ? u->path.unit->meta.id : "";
+
+        return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM;
+}
+
 DBusHandlerResult bus_path_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
         const BusProperty properties[] = {
                 BUS_UNIT_PROPERTIES,
-                { "org.freedesktop.systemd1.Path", "Unit",  bus_property_append_string, "s",     u->path.unit->meta.id  },
+                { "org.freedesktop.systemd1.Path", "Unit",  bus_path_append_unit,       "s",     u                      },
                 { "org.freedesktop.systemd1.Path", "Paths", bus_path_append_paths,      "a(ss)", u                      },
                 { NULL, NULL, NULL, NULL, NULL }
         };