chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v234: Apply missing upstream fixes in src/login (3/6)
[elogind.git]
/
src
/
login
/
logind-action.h
diff --git
a/src/login/logind-action.h
b/src/login/logind-action.h
index 5269237c61566fcc6e0ff9c0f9f3a9080268c049..fb40ae48d2cf660a35b103fb1ba7ada15160efa7 100644
(file)
--- a/
src/login/logind-action.h
+++ b/
src/login/logind-action.h
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#pragma once
/***
#pragma once
/***
@@
-35,6
+33,7
@@
typedef enum HandleAction {
_HANDLE_ACTION_INVALID = -1
} HandleAction;
_HANDLE_ACTION_INVALID = -1
} HandleAction;
+#include "logind-inhibit.h"
#include "logind.h"
int manager_handle_action(
#include "logind.h"
int manager_handle_action(
@@
-44,8
+43,6
@@
int manager_handle_action(
bool ignore_inhibited,
bool is_edge);
bool ignore_inhibited,
bool is_edge);
-int shutdown_or_sleep(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_;