X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-session.h;h=3fec9d9f8ad34e04dafb63f86460643db75bb3a5;hb=48a439f2dac67302f3e7d1ccb21bd93e919efd02;hp=14117bd888b6c0433f0f304c2a065becc1ad4042;hpb=08e1896fb7a00a758c3a71a99e54f0ff69da2fbd;p=elogind.git

diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index 14117bd88..3fec9d9f8 100644
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -25,8 +25,8 @@ typedef struct Session Session;
 typedef enum KillWho KillWho;
 
 #include "list.h"
+#include "login-util.h"
 #include "logind-user.h"
-#include "login-shared.h"
 
 typedef enum SessionState {
         SESSION_OPENING,  /* Session scope is being created */
@@ -70,7 +70,7 @@ struct Session {
         Manager *manager;
 
         const char *id;
-        unsigned int pos;
+        unsigned int position;
         SessionType type;
         SessionClass class;
 
@@ -89,8 +89,11 @@ struct Session {
         char *service;
         char *desktop;
 
-        /* Always NULL.  */
+        /* always NULL */
         char *scope;
+#if 0 /// UNNEEDED by elogind
+        char *scope_job;
+#endif // 0
 
         Seat *seat;
         unsigned int vtnr;
@@ -117,6 +120,7 @@ struct Session {
 
         char *controller;
         Hashmap *devices;
+        sd_bus_track *track;
 
         LIST_FIELDS(Session, sessions_by_user);
         LIST_FIELDS(Session, sessions_by_seat);
@@ -176,7 +180,7 @@ bool session_is_controller(Session *s, const char *sender);
 int session_set_controller(Session *s, const char *sender, bool force);
 void session_drop_controller(Session *s);
 
-int bus_session_method_activate(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
-int bus_session_method_lock(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
-int bus_session_method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
-int bus_session_method_kill(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
+int bus_session_method_activate(sd_bus_message *message, void *userdata, sd_bus_error *error);
+int bus_session_method_lock(sd_bus_message *message, void *userdata, sd_bus_error *error);
+int bus_session_method_terminate(sd_bus_message *message, void *userdata, sd_bus_error *error);
+int bus_session_method_kill(sd_bus_message *message, void *userdata, sd_bus_error *error);