X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-path.c;h=a523b8144627b500307e19b6985dedde5a15dd7c;hb=5b1869eaa22e365ab6595924fe96549b279b5ebc;hp=f7fed1754d14ca492bd62d0617c853312b67b563;hpb=f274ece0f76b5709408821e317e87aef76123db6;p=elogind.git diff --git a/src/core/dbus-path.c b/src/core/dbus-path.c index f7fed1754..a523b8144 100644 --- a/src/core/dbus-path.c +++ b/src/core/dbus-path.c @@ -50,7 +50,7 @@ BUS_UNIT_INTERFACES_LIST \ "org.freedesktop.systemd1.Path\0" -const char bus_path_interface[] _introspect_("Path") = BUS_PATH_INTERFACE; +const char bus_path_interface[] = BUS_PATH_INTERFACE; const char bus_path_invalidating_properties[] = "Result\0"; @@ -84,15 +84,15 @@ static int bus_path_append_paths(DBusMessageIter *i, const char *property, void } static int bus_path_append_unit(DBusMessageIter *i, const char *property, void *data) { - Unit *u = data; - Path *p = PATH(u); + Unit *u = data, *trigger; const char *t; assert(i); assert(property); assert(u); - t = UNIT_DEREF(p->unit) ? UNIT_DEREF(p->unit)->id : ""; + trigger = UNIT_TRIGGER(u); + t = trigger ? trigger->id : ""; return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM; }