chiark / gitweb /
Incorporate sleep.conf into logind.conf
authorAndy Wingo <wingo@pobox.com>
Sat, 29 Aug 2015 09:20:59 +0000 (11:20 +0200)
committerAndy Wingo <wingo@pobox.com>
Sat, 29 Aug 2015 09:25:06 +0000 (11:25 +0200)
commitcaa7531f137aeb260fbda53e89a22f516836e89b
tree221c1aab3b4fdd1aebfbcfe2c4802191a4fb6536
parentd6e877564a5b7f2758291825fa7a2becb663a630
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.
src/login/logind-action.c
src/login/logind-dbus.c
src/login/logind-gperf.gperf
src/login/logind.c
src/login/logind.conf
src/login/logind.h