diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-04-16 01:54:49 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-04-16 02:03:35 +0200 |
| commit | bfebab7f69cb23f3a488f02bc2be9c8309808221 (patch) | |
| tree | 15706e6e3730e3a5b167fa4642d255b9b3956797 /src/dbus-swap.c | |
| parent | strv: properly override settings in env_append() (diff) | |
| download | systemd-bfebab7f69cb23f3a488f02bc2be9c8309808221.tar.xz systemd-bfebab7f69cb23f3a488f02bc2be9c8309808221.zip | |
dbus: split out object management code into dbus-common, and simplify it
Diffstat (limited to 'src/dbus-swap.c')
| -rw-r--r-- | src/dbus-swap.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); } |