screenShield/loginManager: call SetLockedHint when locking/unlocking.

This only matters for logind, not consolekit.

Author: mtwebster

js/misc/loginManager.js

@@ -38,6 +38,9 @@ const SystemdLoginSessionIface = `
     <signal name="Lock"/>
     <signal name="Unlock"/>
     <property name="Active" type="b" access="read"/>
+    <method name="SetLockedHint">
+      <arg type="b" direction="in"/>
+    </method>
   </interface>
 </node>`;
 
@@ -75,6 +78,7 @@ var LoginManagerSystemd = class {
     constructor() {
         this._managerProxy = null;
         this._sessionProxy = null;
+        this.isLocked = false;
 
         this._initSession();
     }
@@ -208,6 +212,16 @@ var LoginManagerSystemd = class {
                 }
             });
     }
+
+    setLockedHint(locked) {
+        if (!this._sessionProxy)
+            return;
+
+        this._sessionProxy.SetLockedHintRemote(locked, (result, error) => {
+            if (error)
+                global.logError('LoginManager: SetLockedHint failed: ' + error);
+        });
+    }
 };
 Signals.addSignalMethods(LoginManagerSystemd.prototype);
 
@@ -291,6 +305,10 @@ var LoginManagerConsoleKit = class {
         // ConsoleKit doesn't have inhibitors
         callback(null);
     }
+
+    setLockedHint(_locked) {
+        // ConsoleKit doesn't have SetLockedHint
+    }
 };
 Signals.addSignalMethods(LoginManagerConsoleKit.prototype);
 

js/ui/screensaver/screenShield.js

@@ -371,33 +371,31 @@ var ScreenShield = GObject.registerClass({
             this.activate(immediate, (success) => {
                 if (success) {
                     this._stopLockDelay();
-                    this._setLocked(true);
+                    this._setLocked();
                 }
             });
         } else {
             this._stopLockDelay();
-            this._setLocked(true);
+            this._setLocked();
         }
     }
 
-    _setLocked(locked) {
-        if (locked === this.isLocked())
+    _setLocked() {
+        if (this.isLocked())
             return;
 
-        if (locked) {
-            this._dialog.saveSystemLayout();
-            this._setState(State.LOCKED);
-            this.emit('locked');
-        } else {
-            this._setState(State.SHOWN);
-        }
+        this._dialog.saveSystemLayout();
+        this._setState(State.LOCKED);
+        this._loginManager.setLockedHint(true);
+        this.emit('locked');
     }
 
     unlock() {
         if (!this.isLocked())
             return;
 
         _log('ScreenShield: Unlocking screen');
+        this._loginManager.setLockedHint(false);
 
         if (this._state === State.UNLOCKING) {
             this._dialog.hide();
@@ -512,7 +510,7 @@ var ScreenShield = GObject.registerClass({
         let lockDelay = this._settings.get_uint('lock-delay');
 
         if (lockDelay === 0) {
-            this._setLocked(true);
+            this._setLocked();
         } else {
             this._lockTimeoutId = GLib.timeout_add_seconds(
                 GLib.PRIORITY_DEFAULT,
@@ -531,7 +529,7 @@ var ScreenShield = GObject.registerClass({
 
     _onLockDelayTimeout() {
         this._lockTimeoutId = 0;
-        this._setLocked(true);
+        this._setLocked();
         return GLib.SOURCE_REMOVE;
     }