X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmanager.h;h=5b3aaf3364fe95d8be0a9d926253f125653d2fc1;hb=7b97f4773207d9e1301f5263229ceba26b515756;hp=e856f5384b8ab3770e3697fabef72b00577c0784;hpb=f295f5c0c0a31afd1914adf5d8a4d7f51e8e0be0;p=elogind.git

diff --git a/src/manager.h b/src/manager.h
index e856f5384..5b3aaf336 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -156,14 +156,15 @@ struct Manager {
         DBusServer *private_bus;
         Set *bus_connections, *bus_connections_for_dispatch;
 
-        Set *subscribed;
         DBusMessage *queued_message; /* This is used during reloading:
                                       * before the reload we queue the
                                       * reply message here, and
                                       * afterwards we send it */
+        DBusConnection *queued_message_connection; /* The connection to send the queued message on */
 
         Hashmap *watch_bus;  /* D-Bus names => Unit object n:1 */
         int32_t name_data_slot;
+        int32_t subscribed_data_slot;
 
         /* Data specific to the Automount subsystem */
         int dev_autofs_fd;
@@ -192,10 +193,11 @@ struct Manager {
 
         bool utmp_reboot_written:1;
 
+        bool show_status;
         bool confirm_spawn;
 };
 
-int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **m);
+int manager_new(ManagerRunningAs running_as, Manager **m);
 void manager_free(Manager *m);
 
 int manager_enumerate(Manager *m);
@@ -240,6 +242,8 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds);
 
 int manager_reload(Manager *m);
 
+bool manager_is_booting_or_shutting_down(Manager *m);
+
 const char *manager_running_as_to_string(ManagerRunningAs i);
 ManagerRunningAs manager_running_as_from_string(const char *s);