screensaver: Track the screensaver proxy in external mode.

The screensaver controller 'locked' property should reflect
correctly regardless of which screensaver is in use.

Author: mtwebster

js/misc/screenSaver.js

@@ -122,8 +122,11 @@ var ScreenSaverService = class ScreenSaverService {
 };
 
 /**
- * Legacy proxy for backward compatibility.
  * Creates a proxy to the DBus service (which may be internal or external).
+ * (Deprecated as of 6.8)
+ * Extensions should connect to Main.screensaverController. Continuing to
+ * use this is still reliable, but is not as immediately up-to-date when the
+ * internal screensaver is in use.
  */
 function ScreenSaverProxy() {
     var self = new Gio.DBusProxy({
@@ -136,22 +139,6 @@ function ScreenSaverProxy() {
                  Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES)
     });
     self.init(null);
-    self.screenSaverActive = false;
-
-    self.connectSignal('ActiveChanged', function(proxy, senderName, [isActive]) {
-        self.screenSaverActive = isActive;
-    });
-    self.connect('notify::g-name-owner', function() {
-        if (self.g_name_owner) {
-            self.GetActiveRemote(function(result, excp) {
-                if (result) {
-                    let [isActive] = result;
-                    self.screenSaverActive = isActive;
-                }
-            });
-        } else
-            self.screenSaverActive = false;
-    });
 
     return self;
 }

js/ui/screensaver/controller.js

@@ -28,6 +28,8 @@ var ScreensaverController = class {
             global.settings.set_boolean("session-locked-state", false);
         }
 
+        this.#screenSaverProxy = new ScreenSaver.ScreenSaverProxy();
+
         // The internal screensaver is the only option for wayland sessions. X11 sessions can use either
         // the internal one or cinnamon-screensaver (>= 6.7).
         if (Meta.is_wayland_compositor() || global.settings.get_boolean('internal-screensaver-enabled')) {
@@ -54,6 +56,26 @@ var ScreensaverController = class {
                 this.#locked = false;
                 this.emit('locked-changed', false);
             });
+        } else {
+            this.#screenSaverProxy.connectSignal('ActiveChanged', (proxy, senderName, [isActive]) => {
+                this.#locked = isActive;
+                this.emit('locked-changed', isActive);
+            });
+
+            this.#screenSaverProxy.connect('notify::g-name-owner', () => {
+                if (this.#screenSaverProxy.g_name_owner) {
+                    this.#screenSaverProxy.GetActiveRemote((result, error) => {
+                        if (result) {
+                            let [isActive] = result;
+                            this.#locked = isActive;
+                            this.emit('locked-changed', isActive);
+                        }
+                    });
+                } else {
+                    this.#locked = false;
+                    this.emit('locked-changed', false);
+                }
+            });
         }
     }
 
@@ -86,9 +108,6 @@ var ScreensaverController = class {
             return;
         }
 
-        if (this.#screenSaverProxy === null)
-            this.#screenSaverProxy = new ScreenSaver.ScreenSaverProxy();
-
         this.#screenSaverProxy.LockRemote(awayMessage || "");
     }