diff options
author | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 11:30:17 +0100 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 12:12:32 +0100 |
commit | 3d1092eab0f4a5c771225c78072a7b6eccb82849 (patch) | |
tree | 2b1603e5a0aa1e7e42f4bb9bbcac73bfac46e63d /src/login/logind.h | |
parent | d76bb3c179b7a32b109e39aa87ff09c8f5a8c178 (diff) |
Major cleanup of all leftovers after rebasing on master.
The patching of elogind in several steps with only partly rebasing on
a common commit with upstream, left the tree in a state, that was
unmergeable with master. By rebasing on master and manually cleaning
up all commits, this merge is now possible.
However, this process left some orphans, that are cleanup now.
Diffstat (limited to 'src/login/logind.h')
-rw-r--r-- | src/login/logind.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/login/logind.h b/src/login/logind.h index 29432823e..4783ea3b2 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -185,9 +185,7 @@ int manager_get_idle_hint(Manager *m, dual_timestamp *t); int manager_get_user_by_pid(Manager *m, pid_t pid, User **user); int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session); -bool manager_is_docked(Manager *m); -int manager_count_displays(Manager *m); -bool manager_is_docked_or_multiple_displays(Manager *m); +bool manager_is_docked_or_external_displays(Manager *m); extern const sd_bus_vtable manager_vtable[]; @@ -227,3 +225,5 @@ int manager_get_seat_from_creds(Manager *m, sd_bus_message *message, const char int manager_setup_wall_message_timer(Manager *m); bool logind_wall_tty_filter(const char *tty, void *userdata); + +int manager_dispatch_delayed(Manager *manager, bool timeout); |