Merge patches from Hleb Valoshka

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

diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index 23f971a527478f668bc50824cdbb09980e317526..1e7f3ad4999ad396f8d4406664f0486bc4f5438a 100644 (file)
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -87,7 +87,6 @@ struct Session {
         char *service;
         char *desktop;
 
-        /* always NULL */
         char *scope;
 #if 0 /// UNNEEDED by elogind
         char *scope_job;
@@ -114,6 +113,8 @@ struct Session {
         bool started:1;
         bool stopping:1;
 
+        bool was_active:1;
+
         sd_bus_message *create_message;
 
         sd_event_source *timer_event_source;
@@ -179,7 +180,7 @@ void session_restore_vt(Session *s);
 void session_leave_vt(Session *s);
 
 bool session_is_controller(Session *s, const char *sender);
-int session_set_controller(Session *s, const char *sender, bool force);
+int session_set_controller(Session *s, const char *sender, bool force, bool prepare);
 void session_drop_controller(Session *s);
 
 int bus_session_method_activate(sd_bus_message *message, void *userdata, sd_bus_error *error);