Fix assertion failure when resuming from sleep/suspend

[elogind.git] / src / login / logind-action.h

diff --git a/src/login/logind-action.h b/src/login/logind-action.h
index e9b424b5f64b949bb93bea032af863b8c76e02c7..6b63b92d3c5e2c62432b8d938c4709f9ce62f8ee 100644 (file)
--- a/src/login/logind-action.h
+++ b/src/login/logind-action.h
@@ -22,7 +22,7 @@
 ***/
 
 typedef enum HandleAction {
 ***/
 
 typedef enum HandleAction {

-        HANDLE_IGNORE,
+        HANDLE_IGNORE = 0,

         HANDLE_POWEROFF,
         HANDLE_REBOOT,
         HANDLE_HALT,
         HANDLE_POWEROFF,
         HANDLE_REBOOT,
         HANDLE_HALT,


@@ -36,7 +36,6 @@ typedef enum HandleAction {
 } HandleAction;
 
 #include "logind.h"
 } HandleAction;
 
 #include "logind.h"

-#include "logind-inhibit.h"

 
 int manager_handle_action(
                 Manager *m,
 
 int manager_handle_action(
                 Manager *m,


@@ -45,6 +44,8 @@ int manager_handle_action(
                 bool ignore_inhibited,
                 bool is_edge);
 
                 bool ignore_inhibited,
                 bool is_edge);
 

+int shutdown_or_sleep(Manager *m, HandleAction action);
+

 const char* handle_action_to_string(HandleAction h) _const_;
 HandleAction handle_action_from_string(const char *s) _pure_;
 
 const char* handle_action_to_string(HandleAction h) _const_;
 HandleAction handle_action_from_string(const char *s) _pure_;