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-timer.c | |
| parent | e1830b12ae8d97a1baaabe28d9ee28c77835463d (diff) | |
dbus: split out object management code into dbus-common, and simplify it
Diffstat (limited to 'src/dbus-timer.c')
| -rw-r--r-- | src/dbus-timer.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/dbus-timer.c b/src/dbus-timer.c index e44f4e2fe..abcbe6f9b 100644 --- a/src/dbus-timer.c +++ b/src/dbus-timer.c @@ -24,6 +24,7 @@ #include "dbus-unit.h" #include "dbus-timer.h" #include "dbus-execute.h" +#include "dbus-common.h" #define BUS_TIMER_INTERFACE \ " <interface name=\"org.freedesktop.systemd1.Timer\">\n" \ @@ -52,12 +53,11 @@ const char bus_timer_invalidating_properties[] = "Timers\0" "NextElapseUSec\0"; -static int bus_timer_append_timers(Manager *m, DBusMessageIter *i, const char *property, void *data) { +static int bus_timer_append_timers(DBusMessageIter *i, const char *property, void *data) { Timer *p = data; DBusMessageIter sub, sub2; TimerValue *k; - assert(m); assert(i); assert(property); assert(p); @@ -99,11 +99,10 @@ static int bus_timer_append_timers(Manager *m, DBusMessageIter *i, const char *p return 0; } -static int bus_timer_append_unit(Manager *m, DBusMessageIter *i, const char *property, void *data) { +static int bus_timer_append_unit(DBusMessageIter *i, const char *property, void *data) { Unit *u = data; const char *t; - assert(m); assert(i); assert(property); assert(u); @@ -122,5 +121,5 @@ DBusHandlerResult bus_timer_message_handler(Unit *u, DBusConnection *c, DBusMess { 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); } |