location: prevent calls when weather auto-locate is disabled

port 1.5

(cherry picked from commit fe561f2b5d)

quickshell/Services/DMSService.qml

@@ -69,7 +69,7 @@ Singleton {
     property bool screensaverInhibited: false
     property var screensaverInhibitors: []
 
-    property var activeSubscriptions: ["network", "network.credentials", "loginctl", "freedesktop", "freedesktop.screensaver", "gamma", "theme.auto", "wallpaper", "bluetooth", "bluetooth.pairing", "brightness", "wlroutput", "evdev", "browser", "dbus", "clipboard", "location", "sysupdate"]
+    property var activeSubscriptions: ["network", "network.credentials", "loginctl", "freedesktop", "freedesktop.screensaver", "gamma", "theme.auto", "wallpaper", "bluetooth", "bluetooth.pairing", "brightness", "wlroutput", "evdev", "browser", "dbus", "clipboard", "sysupdate"]
 
     Component.onCompleted: {
         if (socketPath && socketPath.length > 0) {

quickshell/Services/LocationService.qml

@@ -3,10 +3,13 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import Quickshell
+import qs.Common
+import qs.Services
 
 Singleton {
     id: root
 
+    readonly property bool wantsLocation: SettingsData.weatherEnabled && SettingsData.useAutoLocation
     readonly property bool locationAvailable: DMSService.isConnected && DMSService.capabilities.includes("location")
     readonly property bool valid: latitude !== 0 || longitude !== 0
 
@@ -15,19 +18,46 @@ Singleton {
 
     signal locationChanged(var data)
 
-    onLocationAvailableChanged: {
+    onWantsLocationChanged: {
-        if (locationAvailable && !valid)
+        if (wantsLocation) {
-            getState();
+            ensureSubscription();
+        } else if (DMSService.activeSubscriptions.includes("location")) {
+            DMSService.removeSubscription("location");
+        }
     }
 
+    onLocationAvailableChanged: ensureSubscription()
+
+    Component.onCompleted: ensureSubscription()
+
     Connections {
         target: DMSService
 
-        function onLocationStateUpdate(data) {
+        function onConnectionStateChanged() {
-            if (!locationAvailable)
+            if (DMSService.isConnected)
-                return;
+                root.ensureSubscription();
-            handleStateUpdate(data);
         }
+
+        function onLocationStateUpdate(data) {
+            if (!root.wantsLocation)
+                return;
+            root.handleStateUpdate(data);
+        }
+    }
+
+    function ensureSubscription() {
+        if (!wantsLocation)
+            return;
+        if (!locationAvailable)
+            return;
+        if (DMSService.activeSubscriptions.includes("location"))
+            return;
+        if (DMSService.activeSubscriptions.includes("all"))
+            return;
+
+        DMSService.addSubscription("location");
+        if (!valid)
+            getState();
     }
 
     function handleStateUpdate(data) {
@@ -42,6 +72,8 @@ Singleton {
     }
 
     function getState() {
+        if (!wantsLocation)
+            return;
         if (!locationAvailable)
             return;