X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdbus-snapshot.c;h=0967034f0342dfb04fa202009389f466f57104f8;hb=1124fe6f01b1d59d016c238026f20380f38d98dc;hp=ecb7ec8ea6da86271f1cda3710613b0d1d3e9dd4;hpb=d6c9574fb558d9e304699b1cc7522c3b133adfc9;p=elogind.git

diff --git a/src/dbus-snapshot.c b/src/dbus-snapshot.c
index ecb7ec8ea..0967034f0 100644
--- a/src/dbus-snapshot.c
+++ b/src/dbus-snapshot.c
@@ -21,6 +21,7 @@
 
 #include "dbus-unit.h"
 #include "dbus-snapshot.h"
+#include "dbus-common.h"
 
 #define BUS_SNAPSHOT_INTERFACE                                          \
         " <interface name=\"org.freedesktop.systemd1.Snapshot\">\n"     \
@@ -34,15 +35,21 @@
         BUS_UNIT_INTERFACE                                              \
         BUS_SNAPSHOT_INTERFACE                                          \
         BUS_PROPERTIES_INTERFACE                                        \
+        BUS_PEER_INTERFACE                                              \
         BUS_INTROSPECTABLE_INTERFACE                                    \
         "</node>\n"
 
-const char bus_snapshot_interface[] = BUS_SNAPSHOT_INTERFACE;
+#define INTERFACES_LIST                              \
+        BUS_UNIT_INTERFACES_LIST                     \
+        "org.freedesktop.systemd1.Snapshot\0"
+
+const char bus_snapshot_interface[] _introspect_("Snapshot") = BUS_SNAPSHOT_INTERFACE;
 
 DBusHandlerResult bus_snapshot_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
+        Snapshot *s = SNAPSHOT(u);
         const BusProperty properties[] = {
                 BUS_UNIT_PROPERTIES,
-                { "org.freedesktop.systemd1.Snapshot", "Cleanup", bus_property_append_bool, "b", &u->snapshot.cleanup },
+                { "org.freedesktop.systemd1.Snapshot", "Cleanup", bus_property_append_bool, "b", &s->cleanup },
                 { NULL, NULL, NULL, NULL, NULL }
         };
 
@@ -59,7 +66,7 @@ DBusHandlerResult bus_snapshot_message_handler(Unit *u, DBusConnection *c, DBusM
                         goto oom;
 
         } else
-                return bus_default_message_handler(u->meta.manager, c, message, INTROSPECTION, properties);
+                return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties);
 
         if (reply) {
                 if (!dbus_connection_send(c, reply, NULL))