chiark / gitweb /
build-sys: allow cross-compilation
[elogind.git] / src / dbus-target.c
index c109d9accb6c293379f180d2b9ebe1527c5018ae..1eb3c249f87d6bea15e10b0c3a94ca3c3a2aad31 100644 (file)
@@ -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.
@@ -26,7 +26,6 @@
 
 #define BUS_TARGET_INTERFACE                                            \
         " <interface name=\"org.freedesktop.systemd1.Target\">\n"       \
-        "  <property name=\"SysVRunLevel\" type=\"s\" access=\"read\"/>\n" \
         " </interface>\n"
 
 #define INTROSPECTION                                                   \
         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;
-
-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 }
         };