chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: minor clean-ups
[elogind.git]
/
src
/
login
/
logind-user.h
diff --git
a/src/login/logind-user.h
b/src/login/logind-user.h
index b0fefe9b9cfe10877007ccd97cdead9a79ff11e7..b30e7d60c23bf6600816237a59e2a313e2f47cac 100644
(file)
--- a/
src/login/logind-user.h
+++ b/
src/login/logind-user.h
@@
-24,9
+24,7
@@
typedef struct User User;
#include "list.h"
typedef struct User User;
#include "list.h"
-#include "util.h"
#include "logind.h"
#include "logind.h"
-#include "logind-session.h"
typedef enum UserState {
USER_OFFLINE, /* Not logged in at all */
typedef enum UserState {
USER_OFFLINE, /* Not logged in at all */
@@
-49,11
+47,17
@@
struct User {
char *state_file;
char *runtime_path;
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;
char *slice;
+/// UNNEEDED (and unsupported) by elogind
+#if 0
char *service_job;
char *slice_job;
char *service_job;
char *slice_job;
+#endif // 0
Session *display;
Session *display;
@@
-72,7
+76,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);
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);
int user_finalize(User *u);
UserState user_get_state(User *u);
int user_get_idle_hint(User *u, dual_timestamp *t);
@@
-80,6
+84,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);
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);
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
+96,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_;
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);