From bfebab7f69cb23f3a488f02bc2be9c8309808221 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 16 Apr 2011 01:54:49 +0200
Subject: dbus: split out object management code into dbus-common, and simplify
 it

---
 src/dbus-swap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/dbus-swap.c')

diff --git a/src/dbus-swap.c b/src/dbus-swap.c
index 079912a532..988ca58d4b 100644
--- a/src/dbus-swap.c
+++ b/src/dbus-swap.c
@@ -25,6 +25,7 @@
 #include "dbus-unit.h"
 #include "dbus-swap.h"
 #include "dbus-execute.h"
+#include "dbus-common.h"
 
 #define BUS_SWAP_INTERFACE                                              \
         " <interface name=\"org.freedesktop.systemd1.Swap\">\n"         \
@@ -60,11 +61,10 @@ const char bus_swap_invalidating_properties[] =
         "ExecDeactivate\0"
         "ControlPID\0";
 
-static int bus_swap_append_priority(Manager *m, DBusMessageIter *i, const char *property, void *data) {
+static int bus_swap_append_priority(DBusMessageIter *i, const char *property, void *data) {
         Swap *s = data;
         dbus_int32_t j;
 
-        assert(m);
         assert(i);
         assert(property);
         assert(s);
@@ -96,5 +96,5 @@ DBusHandlerResult bus_swap_message_handler(Unit *u, DBusConnection *c, DBusMessa
                 { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(u->meta.manager, c, message, INTROSPECTION, INTERFACES_LIST, properties);
+        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties);
 }
-- 
cgit v1.2.3-54-g00ecf