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=2cb57e16751a0246cbd407df04af819d59d83bdb;hb=81295bb5aced5d5350db11b0e9bb284e22d2ac37;hpb=c529695e7a30b300fdaa61ace4a8a4ed0e94ad1c diff --git a/src/login/logind-user.h b/src/login/logind-user.h index 2cb57e167..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; @@ -93,5 +91,5 @@ 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 *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); -int bus_user_method_kill(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +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);