diff options
author | Andy Wingo <wingo@pobox.com> | 2015-08-23 12:28:10 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2015-08-23 12:28:10 +0200 |
commit | 06ca7594edc2bf54a32f0fe86fc65976c70f1f11 (patch) | |
tree | 36ec70787c215b0af91ef3c79d282796dc1037f8 /src/login/logind.c | |
parent | fb9ec2d4fc198bcb47352cfce7d436901308eed8 (diff) |
Beginnings of handling suspend/etc within logind
Since we are catching the keys, we might as well just do
suspend/reboot/etc handling here.
Diffstat (limited to 'src/login/logind.c')
-rw-r--r-- | src/login/logind.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/login/logind.c b/src/login/logind.c index e89dc59b4b..5217e1a20e 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -161,7 +161,6 @@ void manager_free(Manager *m) { strv_free(m->kill_only_users); strv_free(m->kill_exclude_users); - free(m->action_job); free(m); } @@ -959,7 +958,7 @@ int manager_run(Manager *m) { if (manager_dispatch_delayed(m) > 0) continue; - if (m->action_what != 0 && !m->action_job) { + if (m->action_what != 0) { usec_t x, y; x = now(CLOCK_MONOTONIC); |