[gnome-shell] Revert "WeatherClient: Set enabled providers after setting a valid location"



commit 42ce04b108f7a607bbd18cdbca8d59bc51092e78
Author: Florian Müllner <fmuellner gnome org>
Date:   Tue Jan 12 18:33:43 2021 +0100

    Revert "WeatherClient: Set enabled providers after setting a valid location"
    
    libgweather changed to not do any implicit network traffic in property setters,
    so this is again safe to pass to the constructor.
    
    This reverts commit 73b7d9ace463fd29a0bd7f315f1d87068c033062.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3577
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1565>

 js/misc/weather.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/js/misc/weather.js b/js/misc/weather.js
index e518f2285b..97880ea91e 100644
--- a/js/misc/weather.js
+++ b/js/misc/weather.js
@@ -68,11 +68,10 @@ var WeatherClient = class {
 
         this._world = GWeather.Location.get_world();
 
-        this._providers = GWeather.Provider.METAR |
-                          GWeather.Provider.YR_NO |
-                          GWeather.Provider.OWM;
-
-        this._weatherInfo = new GWeather.Info({ enabled_providers: 0 });
+        let providers = GWeather.Provider.METAR |
+                        GWeather.Provider.YR_NO |
+                        GWeather.Provider.OWM;
+        this._weatherInfo = new GWeather.Info({ enabled_providers: providers });
         this._weatherInfo.connect_after('updated', () => {
             this._lastUpdate = GLib.DateTime.new_now_local();
             this.emit('changed');
@@ -216,8 +215,6 @@ var WeatherClient = class {
         this._weatherInfo.set_location(location);
         this._locationValid = location != null;
 
-        this._weatherInfo.set_enabled_providers(location ? this._providers : 0);
-
         if (location)
             this._loadInfo();
         else


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]