chiark / gitweb /
Incorporate sleep.conf into logind.conf
authorSven Eden <yamakuzure@gmx.net>
Thu, 2 Feb 2017 08:10:41 +0000 (09:10 +0100)
committerSven Eden <yamakuzure@gmx.net>
Tue, 14 Mar 2017 09:23:13 +0000 (10:23 +0100)
commit5b3e932f4e40d2c5523757242e00e4f4e6ae89cd
treed05f7e31018dafe4e70bae4ae480d7c1683b9908
parente19b8719a54c343372e16b462c27f1e84c987b85
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.
Makefile.am
src/login/logind-action.c
src/login/logind-action.h
src/login/logind-dbus.c
src/login/logind-gperf.gperf
src/login/logind.c
src/login/logind.conf [moved from src/login/elogind.conf with 84% similarity]
src/login/logind.h