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

diff --git a/src/login/logind.h b/src/login/logind.h
index fe6ea0fd3..904dc2046 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -91,16 +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;
+        /* 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;