X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus-device.c;h=f85ad2daf8fbe2579bd8e67009eb2e7a51b0084b;hp=0610ab873ff931b5aeb62c777bb147cf9f6bac97;hb=30fa6468353443318500c1783f5b1b164a32de0b;hpb=4288f619215e3dda0b75113d78e4fb7ba219ed58 diff --git a/src/dbus-device.c b/src/dbus-device.c index 0610ab873..f85ad2daf 100644 --- a/src/dbus-device.c +++ b/src/dbus-device.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. @@ -21,6 +21,7 @@ #include "dbus-unit.h" #include "dbus-device.h" +#include "dbus-common.h" #define BUS_DEVICE_INTERFACE \ " \n" \ @@ -33,17 +34,25 @@ BUS_UNIT_INTERFACE \ BUS_DEVICE_INTERFACE \ BUS_PROPERTIES_INTERFACE \ + BUS_PEER_INTERFACE \ BUS_INTROSPECTABLE_INTERFACE \ "\n" -const char bus_device_interface[] = BUS_DEVICE_INTERFACE; +#define INTERFACES_LIST \ + BUS_UNIT_INTERFACES_LIST \ + "org.freedesktop.systemd1.Device\0" -DBusHandlerResult bus_device_message_handler(Unit *u, DBusMessage *message) { +const char bus_device_interface[] _introspect_("Device") = BUS_DEVICE_INTERFACE; + +const char bus_device_invalidating_properties[] = + "SysFSPath\0"; + +DBusHandlerResult bus_device_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) { const BusProperty properties[] = { BUS_UNIT_PROPERTIES, { "org.freedesktop.systemd1.Device", "SysFSPath", bus_property_append_string, "s", u->device.sysfs }, { NULL, NULL, NULL, NULL, NULL } }; - return bus_default_message_handler(u->meta.manager, message, INTROSPECTION, properties); + return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties); }