X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus-target.c;h=1e00f2dbbb387cacc529a37bc45bb17cf8277ce3;hp=c109d9accb6c293379f180d2b9ebe1527c5018ae;hb=01448ff92d9549785242ffab453bf5bcde348c61;hpb=6681ad4d4164d59175064c42f90dd0641bfa66fd

diff --git a/src/dbus-target.c b/src/dbus-target.c
index c109d9acc..1e00f2dbb 100644
--- a/src/dbus-target.c
+++ b/src/dbus-target.c
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 /***
   This file is part of systemd.
@@ -23,10 +23,10 @@
 
 #include "dbus-unit.h"
 #include "dbus-target.h"
+#include "dbus-common.h"
 
 #define BUS_TARGET_INTERFACE                                            \
         " <interface name=\"org.freedesktop.systemd1.Target\">\n"       \
-        "  <property name=\"SysVRunLevel\" type=\"s\" access=\"read\"/>\n" \
         " </interface>\n"
 
 #define INTROSPECTION                                                   \
@@ -35,38 +35,21 @@
         BUS_UNIT_INTERFACE                                              \
         BUS_TARGET_INTERFACE                                            \
         BUS_PROPERTIES_INTERFACE                                        \
+        BUS_PEER_INTERFACE                                              \
         BUS_INTROSPECTABLE_INTERFACE                                    \
         "</node>\n"
 
-const char bus_target_interface[] = BUS_TARGET_INTERFACE;
+#define INTERFACES_LIST                              \
+        BUS_UNIT_INTERFACES_LIST                     \
+        "org.freedesktop.systemd1.Target\0"
 
-static int bus_target_append_runlevel(Manager *n, DBusMessageIter *i, const char *property, void *data) {
-        Target *t = data;
-        const char *d;
-        char buf[2];
-
-        assert(n);
-        assert(i);
-        assert(property);
-        assert(t);
-
-        buf[0] = (char) target_get_runlevel(t);
-        buf[1] = 0;
-
-        d = buf;
-
-        if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &d))
-                return -ENOMEM;
-
-        return 0;
-}
+const char bus_target_interface[] _introspect_("Target") = BUS_TARGET_INTERFACE;
 
 DBusHandlerResult bus_target_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
         const BusProperty properties[] = {
                 BUS_UNIT_PROPERTIES,
-                { "org.freedesktop.systemd1.Target", "SysVRunLevel", bus_target_append_runlevel, "s", u },
                 { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(u->meta.manager, c, message, INTROSPECTION, properties);
+        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties);
 }