X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-user.h;h=902bb52aa0ce13ac1b0d04a24cac92f6ed9a041a;hp=b0fefe9b9cfe10877007ccd97cdead9a79ff11e7;hb=81295bb5aced5d5350db11b0e9bb284e22d2ac37;hpb=5f41d1f10fd97e93517b6a762b1bec247f4d1171

diff --git a/src/login/logind-user.h b/src/login/logind-user.h
index b0fefe9b9..902bb52aa 100644
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -24,9 +24,7 @@
 typedef struct User User;
 
 #include "list.h"
-#include "util.h"
 #include "logind.h"
-#include "logind-session.h"
 
 typedef enum UserState {
         USER_OFFLINE,    /* Not logged in at all */
@@ -49,12 +47,12 @@ struct User {
         char *state_file;
         char *runtime_path;
 
+        /* These are always NULL, and here just for logind-user-dbus.c
+           to easily provide a NULL value for the user's service and
+           slice properties. */
         char *service;
         char *slice;
 
-        char *service_job;
-        char *slice_job;
-
         Session *display;
 
         dual_timestamp timestamp;
@@ -72,7 +70,7 @@ void user_free(User *u);
 bool user_check_gc(User *u, bool drop_not_started);
 void user_add_to_gc_queue(User *u);
 int user_start(User *u);
-int user_stop(User *u);
+int user_stop(User *u, bool force);
 int user_finalize(User *u);
 UserState user_get_state(User *u);
 int user_get_idle_hint(User *u, dual_timestamp *t);
@@ -80,6 +78,7 @@ int user_save(User *u);
 int user_load(User *u);
 int user_kill(User *u, int signo);
 int user_check_linger_file(User *u);
+void user_elect_display(User *u);
 
 extern const sd_bus_vtable user_vtable[];
 int user_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error);
@@ -91,3 +90,6 @@ int user_send_changed(User *u, const char *properties, ...) _sentinel_;
 
 const char* user_state_to_string(UserState s) _const_;
 UserState user_state_from_string(const char *s) _pure_;
+
+int bus_user_method_terminate(sd_bus_message *message, void *userdata, sd_bus_error *error);
+int bus_user_method_kill(sd_bus_message *message, void *userdata, sd_bus_error *error);