X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdbus-swap.c;h=676ec5cc79aa32b93065e2efa730f0a7195757a5;hb=057fbb58851f97cfcf4d90d5d3c539ac6f8ab13d;hp=e935e09bf212a1e336441e930fe3b3e997f3b67c;hpb=e99e38bbdcca3fe5956823bdb3d38544ccf93221;p=elogind.git
diff --git a/src/dbus-swap.c b/src/dbus-swap.c
index e935e09bf..676ec5cc7 100644
--- a/src/dbus-swap.c
+++ b/src/dbus-swap.c
@@ -25,17 +25,22 @@
#include "dbus-unit.h"
#include "dbus-swap.h"
-static const char introspection[] =
- DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
- ""
- BUS_UNIT_INTERFACE
- BUS_PROPERTIES_INTERFACE
- " "
- " "
- " "
- " "
- BUS_INTROSPECTABLE_INTERFACE
- "";
+#define BUS_SWAP_INTERFACE \
+ " \n" \
+ " \n" \
+ " \n" \
+ " \n"
+
+#define INTROSPECTION \
+ DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \
+ "\n" \
+ BUS_UNIT_INTERFACE \
+ BUS_SWAP_INTERFACE \
+ BUS_PROPERTIES_INTERFACE \
+ BUS_INTROSPECTABLE_INTERFACE \
+ "\n"
+
+const char bus_swap_interface[] = BUS_SWAP_INTERFACE;
static int bus_swap_append_priority(Manager *m, DBusMessageIter *i, const char *property, void *data) {
Swap *s = data;
@@ -61,7 +66,7 @@ static int bus_swap_append_priority(Manager *m, DBusMessageIter *i, const char *
return 0;
}
-DBusHandlerResult bus_swap_message_handler(Unit *u, DBusMessage *message) {
+DBusHandlerResult bus_swap_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
const BusProperty properties[] = {
BUS_UNIT_PROPERTIES,
{ "org.freedesktop.systemd1.Swap", "What", bus_property_append_string, "s", u->swap.what },
@@ -69,5 +74,5 @@ DBusHandlerResult bus_swap_message_handler(Unit *u, DBusMessage *message) {
{ NULL, NULL, NULL, NULL, NULL }
};
- return bus_default_message_handler(u->meta.manager, message, introspection, properties);
+ return bus_default_message_handler(u->meta.manager, c, message, INTROSPECTION, properties);
}