weather: added showpopup option; closes #352

diff --git a/widget/weather.lua b/widget/weather.lua
index 10981466179f600900ca27c56c04d931a780c1dd..82c8ebf4b2edbe70b75b404a9d0ee6400fdef826 100644 (file)
--- a/widget/weather.lua
+++ b/widget/weather.lua
@@ -53,6 +53,7 @@ local function factory(args)
                                   end
     local weather_na_markup     = args.weather_na_markup or " N/A "
     local followtag             = args.followtag or false
                                   end
     local weather_na_markup     = args.weather_na_markup or " N/A "
     local followtag             = args.followtag or false

+    local showpopup             = args.showpopup or "on"

     local settings              = args.settings or function() end
 
     weather.widget:set_markup(weather_na_markup)
     local settings              = args.settings or function() end
 
     weather.widget:set_markup(weather_na_markup)


@@ -162,7 +163,7 @@ local function factory(args)
         end)
     end
 
         end)
     end
 

-    weather.attach(weather.widget)
+    if showpopup == "on" then weather.attach(weather.widget) end

 
     weather.timer = helpers.newtimer("weather-" .. city_id, timeout, weather.update, false, true)
     weather.timer_forecast = helpers.newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update, false, true)
 
     weather.timer = helpers.newtimer("weather-" .. city_id, timeout, weather.update, false, true)
     weather.timer_forecast = helpers.newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update, false, true)

diff --git a/wiki b/wiki
index 666575233da2ff2f7973320ec69ddf403454b400..bb1a4d45d8ec98109167a53a4ebf2ef9017843c3 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 666575233da2ff2f7973320ec69ddf403454b400
+Subproject commit bb1a4d45d8ec98109167a53a4ebf2ef9017843c3