X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus-timer.c;h=07d425e20e9200926a3a421dc193ed8009243b39;hp=e44f4e2feaf8b2b87adbf9364c87ad0ce4bd57c9;hb=dd338f01f545fd29777d7c1a53c7c658a409cda6;hpb=05feefe0fb049bb0f7c59584058ee0350462920c

diff --git a/src/dbus-timer.c b/src/dbus-timer.c
index e44f4e2fe..07d425e20 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,16 +99,15 @@ 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);
 
-        t = u->timer.unit ? u->timer.unit->meta.id : "";
+        t = UNIT_DEREF(u->timer.unit) ? UNIT_DEREF(u->timer.unit)->meta.id : "";
 
         return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM;
 }
@@ -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);
 }