Reuse last coordinates

elementary · Jan 30, 2024 · 8c3dd08 · 8c3dd08
1 parent a49c0ae
commit 8c3dd08
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 22 deletions.
diff --git a/src/AccountsService.vala b/src/AccountsService.vala
@@ -70,15 +70,14 @@ public interface SettingsDaemon.AccountsService : Object {
     public abstract bool orientation_lock { get; set; }
 
     /* Prefer Dark Schedule (part of interface settings)*/
-    public abstract Coordinates prefer_dark_last_coordinates { get; set; }
+    /* Last coordinates are reused for Night Light settings */
+    public abstract Coordinates last_coordinates { get; set; }
     public abstract int prefer_dark_schedule { get; set; }
     public abstract double prefer_dark_schedule_from { get; set; }
     public abstract double prefer_dark_schedule_to { get; set; }
 
     /* Night Light */
-
     public abstract bool night_light_enabled { get; set; }
-    public abstract Coordinates night_light_last_coordinates { get; set; }
     public abstract bool night_light_schedule_automatic { get; set; }
     public abstract double night_light_schedule_from { get; set; }
     public abstract double night_light_schedule_to { get; set; }

diff --git a/src/Backends/InterfaceSettings.vala b/src/Backends/InterfaceSettings.vala
@@ -122,7 +122,7 @@ public class SettingsDaemon.Backends.InterfaceSettings : GLib.Object {
 
             last_coordinates_value.@get ("(dd)", out latitude, out longitude);
 
-            accounts_service.prefer_dark_last_coordinates = AccountsService.Coordinates () {
+            accounts_service.last_coordinates = AccountsService.Coordinates () {
                 latitude = latitude,
                 longitude = longitude
             };

diff --git a/src/Backends/NightLightSettings.vala b/src/Backends/NightLightSettings.vala
@@ -6,7 +6,6 @@
  public class SettingsDaemon.Backends.NightLightSettings : GLib.Object {
     private const string NIGHT_LIGHT_SCHEMA = "org.gnome.settings-daemon.plugins.color";
     private const string NIGHT_LIGHT_ENABLED = "night-light-enabled";
-    private const string NIGHT_LIGHT_LAST_COORDINATES = "night-light-last-coordinates";
     private const string NIGHT_LIGHT_SCHEDULE_AUTOMATIC = "night-light-schedule-automatic";
     private const string NIGHT_LIGHT_SCHEDULE_FROM = "night-light-schedule-from";
     private const string NIGHT_LIGHT_SCHEDULE_TO = "night-light-schedule-to";
@@ -33,7 +32,6 @@
 
         night_light_settings.changed.connect ((key) => {
             if (key == NIGHT_LIGHT_ENABLED ||
-                key == NIGHT_LIGHT_LAST_COORDINATES ||
                 key == NIGHT_LIGHT_SCHEDULE_AUTOMATIC ||
                 key == NIGHT_LIGHT_SCHEDULE_FROM ||
                 key == NIGHT_LIGHT_SCHEDULE_TO ||
@@ -45,22 +43,6 @@
 
     private void sync_gsettings_to_accountsservice () {
         accounts_service.night_light_enabled = night_light_settings.get_boolean (NIGHT_LIGHT_ENABLED);
-
-        var last_coordinates_value = night_light_settings.get_value (NIGHT_LIGHT_LAST_COORDINATES);
-        if (last_coordinates_value.is_of_type (GLib.VariantType.TUPLE)) {
-            double latitude;
-            double longitude;
-
-            last_coordinates_value.@get ("(dd)", out latitude, out longitude);
-
-            accounts_service.night_light_last_coordinates = AccountsService.Coordinates () {
-                latitude = latitude,
-                longitude = longitude
-            };
-        } else {
-            warning ("Unknown night light coordinates type, unable to save to AccountsService");
-        }
-
         accounts_service.night_light_schedule_automatic = night_light_settings.get_boolean (NIGHT_LIGHT_SCHEDULE_AUTOMATIC);
         accounts_service.night_light_schedule_from = night_light_settings.get_double (NIGHT_LIGHT_SCHEDULE_FROM);
         accounts_service.night_light_schedule_to = night_light_settings.get_double (NIGHT_LIGHT_SCHEDULE_TO);