sd-bus: drop bus parameter from message callback prototype

[elogind.git] / src / login / logind-user.h

diff --git a/src/login/logind-user.h b/src/login/logind-user.h
index b9171d345d6df68303a9c78a10d20024306c6c53..902bb52aa0ce13ac1b0d04a24cac92f6ed9a041a 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"
-#include "util.h"
 #include "logind.h"
-#include "logind-session.h"
 
 typedef enum UserState {
         USER_OFFLINE,    /* Not logged in at all */
@@ -49,19 +47,19 @@ 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;
 
         bool in_gc_queue:1;
         bool started:1;
-        bool closing:1;
+        bool stopping:1;
 
         LIST_HEAD(Session, sessions);
         LIST_FIELDS(User, gc_queue);
@@ -69,23 +67,29 @@ struct User {
 
 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);
+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_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);
+int user_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
 char *user_bus_path(User *s);
 
-extern const DBusObjectPathVTable bus_user_vtable;
-
 int user_send_signal(User *u, bool new_user);
-int user_send_changed(User *u, const char *properties);
+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);