diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-05-05 00:46:31 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-05-08 13:54:23 +0200 |
| commit | 4943c1c94ba751c98763f4232b4350481b22c90a (patch) | |
| tree | b43c4026d0941298ddff971f191ca40b1e2c56b5 /src/login/logind-inhibit.c | |
| parent | dd5f0a96f734aafa00f6c3aea4003b7fdd278d81 (diff) | |
logind: use "sleep" as generic term for "suspend", "hibernate", and later on "hybrid suspend"
Diffstat (limited to 'src/login/logind-inhibit.c')
| -rw-r--r-- | src/login/logind-inhibit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c index b5b801e5e0..2007ec79e4 100644 --- a/src/login/logind-inhibit.c +++ b/src/login/logind-inhibit.c @@ -376,12 +376,12 @@ const char *inhibit_what_to_string(InhibitWhat w) { static const char* const table[_INHIBIT_WHAT_MAX] = { [0] = "", [INHIBIT_SHUTDOWN] = "shutdown", - [INHIBIT_SUSPEND] = "suspend", + [INHIBIT_SLEEP] = "sleep", [INHIBIT_IDLE] = "idle", - [INHIBIT_SHUTDOWN|INHIBIT_SUSPEND] = "shutdown:suspend", + [INHIBIT_SHUTDOWN|INHIBIT_SLEEP] = "shutdown:sleep", [INHIBIT_SHUTDOWN|INHIBIT_IDLE] = "shutdown:idle", - [INHIBIT_SHUTDOWN|INHIBIT_SUSPEND|INHIBIT_IDLE] = "shutdown:suspend:idle", - [INHIBIT_SUSPEND|INHIBIT_IDLE] = "suspend:idle" + [INHIBIT_SHUTDOWN|INHIBIT_SLEEP|INHIBIT_IDLE] = "shutdown:sleep:idle", + [INHIBIT_SLEEP|INHIBIT_IDLE] = "sleep:idle" }; if (w < 0 || w >= _INHIBIT_WHAT_MAX) @@ -398,8 +398,8 @@ InhibitWhat inhibit_what_from_string(const char *s) { FOREACH_WORD_SEPARATOR(w, l, s, ":", state) { if (l == 8 && strncmp(w, "shutdown", l) == 0) what |= INHIBIT_SHUTDOWN; - else if (l == 7 && strncmp(w, "suspend", l) == 0) - what |= INHIBIT_SUSPEND; + else if (l == 5 && strncmp(w, "sleep", l) == 0) + what |= INHIBIT_SLEEP; else if (l == 4 && strncmp(w, "idle", l) == 0) what |= INHIBIT_IDLE; else |