Fix possible lack of status messages on shutdown/reboot

[elogind.git] / src / core / dbus-timer.c

diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index 75add815196168c00da42399873dd5a4e311bf51..c6f1dd9b7f72bd804cd84c87d844cca174ff62f1 100644 (file)
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -51,7 +51,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Timer\0"
 
-const char bus_timer_interface[] _introspect_("Timer") = BUS_TIMER_INTERFACE;
+const char bus_timer_interface[] = BUS_TIMER_INTERFACE;
 
 const char bus_timer_invalidating_properties[] =
         "TimersMonotonic\0"
@@ -152,15 +152,15 @@ static int bus_timer_append_calendar_timers(DBusMessageIter *i, const char *prop
 }
 
 static int bus_timer_append_unit(DBusMessageIter *i, const char *property, void *data) {
-        Unit *u = data;
-        Timer *timer = TIMER(u);
+        Unit *u = data, *trigger;
         const char *t;
 
         assert(i);
         assert(property);
         assert(u);
 
-        t = UNIT_DEREF(timer->unit) ? UNIT_DEREF(timer->unit)->id : "";
+        trigger = UNIT_TRIGGER(u);
+        t = trigger ? trigger->id : "";
 
         return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM;
 }