X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind.h;h=904dc20467100157eecee5a550cefa5f711bc910;hp=7a0f8f25b0416e8c9af3e5b92f005579b22e44a8;hb=314b4b0a68d9ab35de981923a088fc8c8820caa5;hpb=5d1fb81b2c602abd2605f6e50810ac7fcb06c024

diff --git a/src/login/logind.h b/src/login/logind.h
index 7a0f8f25b..904dc2046 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -91,17 +91,21 @@ struct Manager {
         Hashmap *inhibitor_fds;
         Hashmap *button_fds;
 
-        /* If a shutdown was delayed due to a inhibitor this contains
-           the unit name we are supposed to start after the delay is
-           over */
-        const char *delayed_unit;
-        InhibitWhat delayed_what;
-        usec_t delayed_timestamp;
-
         usec_t inhibit_delay_max;
 
-        char* action_job;
-        bool send_resumed_after_action_job;
+        /* If an action is currently being executed or is delayed,
+         * this is != 0 and encodes what is being done */
+        InhibitWhat action_what;
+
+        /* If a shutdown/suspend was delayed due to a inhibitor this
+           contains the unit name we are supposed to start after the
+           delay is over */
+        const char *action_unit;
+
+        /* If a shutdown/suspend is currently executed, then this is
+         * the job of it */
+        char *action_job;
+        usec_t action_timestamp;
 
         int idle_action_fd; /* the timer_fd */
         usec_t idle_action_usec;