X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind.h;h=6644ac08688c9629aab80712c7db60fa3b549d25;hb=24aa8c70860838af5c1dbfc81131888a4865d16c;hp=ad437b72cb923859d01bca502e31aa707037994c;hpb=198eb9458184a7b82a85df1d03a3dd52f24f5f26;p=elogind.git

diff --git a/src/login/logind.h b/src/login/logind.h
index ad437b72c..6644ac086 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -65,11 +65,6 @@ struct Manager {
 
         int console_active_fd;
 
-        unsigned n_autovts;
-
-        unsigned reserve_vt;
-        int reserve_vt_fd;
-
         Seat *seat0;
 
         char **kill_only_users, **kill_exclude_users;
@@ -78,9 +73,6 @@ struct Manager {
         unsigned long session_counter;
         unsigned long inhibit_counter;
 
-        Hashmap *session_units;
-        Hashmap *user_units;
-
         usec_t inhibit_delay_max;
 
         /* If an action is currently being executed or is delayed,
@@ -88,26 +80,10 @@ struct Manager {
         InhibitWhat action_what;
 
         /* If a shutdown/suspend was delayed due to a inhibitor this
-           contains the unit name we are supposed to start after the
+           contains the action we are supposed to perform after the
            delay is over */
-        const char *action_unit;
-
-        /* If a shutdown/suspend is currently executed, then this is
-         * the job of it */
-        char *action_job;
-        sd_event_source *inhibit_timeout_source;
-
-        char *scheduled_shutdown_type;
-        usec_t scheduled_shutdown_timeout;
-        sd_event_source *scheduled_shutdown_timeout_source;
-        uid_t scheduled_shutdown_uid;
-        char *scheduled_shutdown_tty;
-        sd_event_source *nologin_timeout_source;
-        bool unlink_nologin;
-
-        char *wall_message;
-        unsigned enable_wall_messages;
-        sd_event_source *wall_message_timeout_source;
+        HandleAction pending_action;
+        usec_t action_timestamp;
 
         sd_event_source *idle_action_event_source;
         usec_t idle_action_usec;
@@ -135,6 +111,9 @@ struct Manager {
         size_t runtime_dir_size;
 };
 
+Manager *manager_new(void);
+void manager_free(Manager *m);
+
 int manager_add_device(Manager *m, const char *sysfs, bool master, Device **_device);
 int manager_add_button(Manager *m, const char *name, Button **_button);
 int manager_add_seat(Manager *m, const char *id, Seat **_seat);
@@ -147,7 +126,10 @@ int manager_add_inhibitor(Manager *m, const char* id, Inhibitor **_inhibitor);
 int manager_process_seat_device(Manager *m, struct udev_device *d);
 int manager_process_button_device(Manager *m, struct udev_device *d);
 
-int manager_spawn_autovt(Manager *m, unsigned int vtnr);
+int manager_startup(Manager *m);
+int manager_run(Manager *m);
+
+void manager_gc(Manager *m, bool drop_not_started);
 
 bool manager_shall_kill(Manager *m, const char *user);
 
@@ -160,16 +142,13 @@ bool manager_is_docked_or_external_displays(Manager *m);
 
 extern const sd_bus_vtable manager_vtable[];
 
-int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *error);
-int match_unit_removed(sd_bus_message *message, void *userdata, sd_bus_error *error);
-int match_properties_changed(sd_bus_message *message, void *userdata, sd_bus_error *error);
-int match_reloading(sd_bus_message *message, void *userdata, sd_bus_error *error);
-int match_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *error);
-
-int bus_manager_shutdown_or_sleep_now_or_later(Manager *m, const char *unit_name, InhibitWhat w, sd_bus_error *error);
+int bus_manager_shutdown_or_sleep_now_or_later(Manager *m, HandleAction action, InhibitWhat w, sd_bus_error *error);
+int shutdown_or_sleep(HandleAction action);
 
 int manager_send_changed(Manager *manager, const char *property, ...) _sentinel_;
 
+int manager_dispatch_delayed(Manager *manager);
+
 int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, const char *after, const char *after2, sd_bus_error *error, char **job);
 int manager_start_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job);
 int manager_stop_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job);
@@ -192,7 +171,5 @@ int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const ch
 int manager_get_user_from_creds(Manager *m, sd_bus_message *message, uid_t uid, sd_bus_error *error, User **ret);
 int manager_get_seat_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Seat **ret);
 
-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);
+int manager_dispatch_delayed(Manager *manager, bool timeout);
\ No newline at end of file