loginManager: add sessionIsActive property updated when ActiveChanged

fires from logind/ck.

Author: mtwebster

js/misc/loginManager.js

@@ -79,7 +79,7 @@ var LoginManagerSystemd = class {
     constructor() {
         this._managerProxy = null;
         this._sessionProxy = null;
-        this.isLocked = false;
+        this.sessionIsActive = true;
 
         this._initSession();
     }
@@ -163,14 +163,13 @@ var LoginManagerSystemd = class {
             this._sessionProxy.connect('g-properties-changed', (proxy, changed, invalidated) => {
                 if ('Active' in changed.deep_unpack()) {
                     let active = this._sessionProxy.Active;
+                    this.sessionIsActive = active;
                     _log(`LoginManager: Session Active property changed: ${active}`);
-                    if (active) {
-                        _log('LoginManager: Session became active, emitting active');
-                        this.emit('active');
-                    }
+                    this.emit('active-changed', active);
                 }
             });
 
+            this.sessionIsActive = this._sessionProxy.Active;
             this.emit('session-ready');
         } catch (e) {
             global.logError('LoginManager: Failed to connect to logind session: ' + e.message);
@@ -230,6 +229,7 @@ var LoginManagerConsoleKit = class {
     constructor() {
         this._managerProxy = null;
         this._sessionProxy = null;
+        this.sessionIsActive = true;
 
         this._initSession();
     }
@@ -283,11 +283,9 @@ var LoginManagerConsoleKit = class {
             });
 
             this._sessionProxy.connectSignal('ActiveChanged', (proxy, sender, [active]) => {
+                this.sessionIsActive = active;
                 _log(`LoginManager: ConsoleKit ActiveChanged: ${active}`);
-                if (active) {
-                    _log('LoginManager: Session became active, emitting active');
-                    this.emit('active');
-                }
+                this.emit('active-changed', active);
             });
 
             this.emit('session-ready');

js/ui/screensaver/screenShield.js

@@ -188,7 +188,7 @@ var ScreenShield = GObject.registerClass({
 
         this._loginManager.connect('lock', this._onSessionLock.bind(this));
         this._loginManager.connect('unlock', this._onSessionUnlock.bind(this));
-        this._loginManager.connect('active', this._onSessionActive.bind(this));
+        this._loginManager.connect('active-changed', this._onSessionActiveChanged.bind(this));
 
         this._monitorsChangedId = Main.layoutManager.connect('monitors-changed',
             this._onMonitorsChanged.bind(this));
@@ -671,8 +671,10 @@ var ScreenShield = GObject.registerClass({
         }
     }
 
-    _onSessionActive() {
-        _log(`ScreenShield: Received active signal from LoginManager (state=${this._state})`);
+    _onSessionActiveChanged(lm, active) {
+        _log(`ScreenShield: Received active-changed signal from LoginManager (active=${active}, state=${this._state})`);
+        if (!active)
+            return;
         if (this._state === State.LOCKED) {
             this.showUnlockDialog();
         }