chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 4e0568fea92b7e98ee99868c2870a968afbbc3fe..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"
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,12
+47,12
@@
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;
- char *service_job;
- char *slice_job;
-
Session *display;
dual_timestamp timestamp;
Session *display;
dual_timestamp timestamp;
@@
-92,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_;
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);