diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-08-29 11:20:59 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-08-29 11:25:06 +0200 |
| commit | caa7531f137aeb260fbda53e89a22f516836e89b (patch) | |
| tree | 221c1aab3b4fdd1aebfbcfe2c4802191a4fb6536 /src/login/logind-dbus.c | |
| parent | d6e877564a5b7f2758291825fa7a2becb663a630 (diff) | |
Incorporate sleep.conf into logind.conf
* src/login/logind-action.c (shutdown_or_sleep, do_sleep): Take modes
from the manager instead of parsing them ourselves.
* src/login/logind-dbus.c (execute_shutdown_or_sleep): Adapt to
shutdown_or_sleep prototype change.
* src/login/logind-gperf.gperf: Add config items from sleep.conf.
* src/login/logind.c (manager_new): Wire up defaults for new config
items.
(manager_free): Free new config items.
(manager_parse_config_file): Arrange to parse a single
elogind/logind.conf file, not grovelling all over the filesystem.
Take the file from the ELOGIND_CONF_FILE environment variable if
present.
Diffstat (limited to 'src/login/logind-dbus.c')
| -rw-r--r-- | src/login/logind-dbus.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 301c4de2fe..859ad3b58c 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1430,9 +1430,7 @@ static int execute_shutdown_or_sleep( bus_manager_log_shutdown(m, w, action); - /* FIXME: here do the thing. */ - - r = shutdown_or_sleep(action); + r = shutdown_or_sleep(m, action); if (r < 0) return r; |