X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus-target.c;h=69e82120764e7f8365ef102934287a3b7667e2bf;hp=c109d9accb6c293379f180d2b9ebe1527c5018ae;hb=bb7df0da2d14800d4cb871ab07a9d3595990fbad;hpb=6681ad4d4164d59175064c42f90dd0641bfa66fd diff --git a/src/dbus-target.c b/src/dbus-target.c index c109d9acc..69e821207 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. @@ -26,7 +26,6 @@ #define BUS_TARGET_INTERFACE \ " \n" \ - " \n" \ " \n" #define INTROSPECTION \ @@ -35,36 +34,15 @@ BUS_UNIT_INTERFACE \ BUS_TARGET_INTERFACE \ BUS_PROPERTIES_INTERFACE \ + BUS_PEER_INTERFACE \ BUS_INTROSPECTABLE_INTERFACE \ "\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; -} - 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 } };