Fix possible lack of status messages on shutdown/reboot

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

diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index 4cd3a13fd2c9f68e3a31792f16b7dda90932661a..032915d14ea4d0bbccb552058dc44a5c3fd4cb3c 100644 (file)
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -32,7 +32,7 @@
 #include "path-util.h"
 #include "fileio.h"
 
-const char bus_unit_interface[] _introspect_("Unit") = BUS_UNIT_INTERFACE;
+const char bus_unit_interface[] = BUS_UNIT_INTERFACE;
 
 #define INVALIDATING_PROPERTIES                 \
         "LoadState\0"                           \
@@ -627,7 +627,7 @@ void bus_unit_send_change_signal(Unit *u) {
         assert(u);
 
         if (u->in_dbus_queue) {
-                LIST_REMOVE(Unit, dbus_queue, u->manager->dbus_unit_queue, u);
+                LIST_REMOVE(dbus_queue, u->manager->dbus_unit_queue, u);
                 u->in_dbus_queue = false;
         }
 
@@ -801,7 +801,7 @@ DBusHandlerResult bus_unit_queue_job(
         if (!cl)
                 goto oom;
 
-        LIST_PREPEND(JobBusClient, client, j->bus_client_list, cl);
+        LIST_PREPEND(client, j->bus_client_list, cl);
 
         reply = dbus_message_new_method_return(message);
         if (!reply)
@@ -981,7 +981,7 @@ int bus_unit_set_properties(
 
                 if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_INVALID) {
 
-                        if (for_real)
+                        if (for_real || mode == UNIT_CHECK)
                                 break;
 
                         /* Reached EOF. Let's try again, and this time for realz... */