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: fix serialization of ListSeats() bus call
[elogind.git]
/
src
/
login
/
logind-user.h
diff --git
a/src/login/logind-user.h
b/src/login/logind-user.h
index cffac3544725f87ead21f257bc04f1a73f077fa9..de7ba6d57e034f48710a56f7d07c367f3a248d43 100644
(file)
--- a/
src/login/logind-user.h
+++ b/
src/login/logind-user.h
@@
-1,7
+1,6
@@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef foologinduserhfoo
-#define foologinduserhfoo
+#pragma once
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-31,6
+30,7
@@
typedef struct User User;
typedef enum UserState {
USER_OFFLINE, /* Not logged in at all */
typedef enum UserState {
USER_OFFLINE, /* Not logged in at all */
+ USER_OPENING, /* Is logging in */
USER_LINGERING, /* Lingering has been enabled by the admin for this user */
USER_ONLINE, /* User logged in */
USER_ACTIVE, /* User logged in and has a session in the fg */
USER_LINGERING, /* Lingering has been enabled by the admin for this user */
USER_ONLINE, /* User logged in */
USER_ACTIVE, /* User logged in and has a session in the fg */
@@
-48,8
+48,12
@@
struct User {
char *state_file;
char *runtime_path;
char *state_file;
char *runtime_path;
+
char *service;
char *service;
- char *cgroup_path;
+ char *slice;
+
+ char *service_job;
+ char *slice_job;
Session *display;
Session *display;
@@
-57,6
+61,7
@@
struct User {
bool in_gc_queue:1;
bool started:1;
bool in_gc_queue:1;
bool started:1;
+ bool closing:1;
LIST_HEAD(Session, sessions);
LIST_FIELDS(User, gc_queue);
LIST_HEAD(Session, sessions);
LIST_FIELDS(User, gc_queue);
@@
-64,24
+69,24
@@
struct User {
User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name);
void user_free(User *u);
User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name);
void user_free(User *u);
-
int
user_check_gc(User *u, bool drop_not_started);
+
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);
void user_add_to_gc_queue(User *u);
int user_start(User *u);
int user_stop(User *u);
+int user_finalize(User *u);
UserState user_get_state(User *u);
int user_get_idle_hint(User *u, dual_timestamp *t);
int user_save(User *u);
int user_load(User *u);
int user_kill(User *u, int signo);
UserState user_get_state(User *u);
int user_get_idle_hint(User *u, dual_timestamp *t);
int user_save(User *u);
int user_load(User *u);
int user_kill(User *u, int signo);
+extern const sd_bus_vtable user_vtable[];
+int user_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata);
+int user_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata);
char *user_bus_path(User *s);
char *user_bus_path(User *s);
-extern const DBusObjectPathVTable bus_user_vtable;
-
int user_send_signal(User *u, bool new_user);
int user_send_signal(User *u, bool new_user);
-int user_send_changed(User *u, const char *properties);
-
-const char* user_state_to_string(UserState s);
-UserState user_state_from_string(const char *s);
+int user_send_changed(User *u, const char *properties, ...) _sentinel_;
-#endif
+const char* user_state_to_string(UserState s) _const_;
+UserState user_state_from_string(const char *s) _pure_;