diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-11-19 18:48:14 +0100 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-11-19 18:48:56 +0100 |
| commit | e1e4981281ad1b819ebaa55f589c771130d35301 (patch) | |
| tree | b34d417ef77ae46f50e11fc33856453bf289baab /src/login/logind-dbus.c | |
| parent | 3b35a18b69bfe77c5e61ecaf0d5c6c3a64ad97dc (diff) | |
v235: Added missing updates
Diffstat (limited to 'src/login/logind-dbus.c')
| -rw-r--r-- | src/login/logind-dbus.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index e80b778cf..63cd1a4d4 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1497,8 +1497,11 @@ int manager_set_lid_switch_ignore(Manager *m, usec_t until) { return r; } -#if 0 /// elogind has its own variant in elogind-dbus.c +#if 0 /// elogind-dbus.c needs to access this static int send_prepare_for(Manager *m, InhibitWhat w, bool _active) { +#else +int send_prepare_for(Manager *m, InhibitWhat w, bool _active) { +#endif // 0 static const char * const signal_name[_INHIBIT_WHAT_MAX] = { [INHIBIT_SHUTDOWN] = "PrepareForShutdown", @@ -1520,6 +1523,7 @@ static int send_prepare_for(Manager *m, InhibitWhat w, bool _active) { active); } +#if 0 /// elogind has its own variant in elogind-dbus.c static int execute_shutdown_or_sleep( Manager *m, InhibitWhat w, @@ -1674,10 +1678,6 @@ static int delay_shutdown_or_sleep( return 0; } #endif // 0 -#if 0 /// elogind-dbus.c needs to access this -#else -int send_prepare_for(Manager *m, InhibitWhat w, bool _active) { -#endif // 0 #if 0 /// elogind has its own variant in elogind-dbus.c int bus_manager_shutdown_or_sleep_now_or_later( @@ -1957,7 +1957,6 @@ fail: return log_error_errno(r, "Failed to write information about scheduled shutdowns: %m"); } -#if 0 /// elogind has its own variant in elogind-dbus.c static void reset_scheduled_shutdown(Manager *m) { m->scheduled_shutdown_timeout_source = sd_event_source_unref(m->scheduled_shutdown_timeout_source); m->wall_message_timeout_source = sd_event_source_unref(m->wall_message_timeout_source); @@ -1973,6 +1972,7 @@ static void reset_scheduled_shutdown(Manager *m) { (void) unlink("/run/systemd/shutdown/scheduled"); } +#if 0 /// elogind has its own variant in elogind-dbus.c static int manager_scheduled_shutdown_handler( sd_event_source *s, uint64_t usec, |