Fixes for the silly case where a client's borders are bigger than its allotted space

[etc/awesome.git] / widgets / weather.lua

diff --git a/widgets/weather.lua b/widgets/weather.lua
index b745ebec176bff39115326756ef30c0732f64049..de3163c9602ffb8e27d78329ba14817e2eddad9e 100644 (file)
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -41,7 +41,7 @@ local function worker(args)
     local date_cmd              = args.date_cmd or "date -u -d @%d +'%%a %%d'"
     local icons_path            = args.icons_path or lain_icons .. "openweathermap/"
     local notification_preset   = args.notification_preset or {}
     local date_cmd              = args.date_cmd or "date -u -d @%d +'%%a %%d'"
     local icons_path            = args.icons_path or lain_icons .. "openweathermap/"
     local notification_preset   = args.notification_preset or {}

-    local notification_text_cmd = args.notification_text_cmd or
+    local notification_text_fun = args.notification_text_fun or

                                   function (day, desc, tmin, tmax)
                                       return string.format("<b>%s</b>: %s, %d - %d  ", day, desc, tmin, tmax)
                                   end
                                   function (day, desc, tmin, tmax)
                                       return string.format("<b>%s</b>: %s, %d - %d  ", day, desc, tmin, tmax)
                                   end


@@ -98,7 +98,7 @@ local function worker(args)
                     local desc = weather_now["list"][i]["weather"][1]["description"]
 
                     weather.notification_text = weather.notification_text ..
                     local desc = weather_now["list"][i]["weather"][1]["description"]
 
                     weather.notification_text = weather.notification_text ..

-                                                notification_text_cmd(day, desc, tmin, tmax)
+                                                notification_text_fun(day, desc, tmin, tmax)

 
                     if i < weather_now["cnt"] then
                         weather.notification_text = weather.notification_text .. "\n"
 
                     if i < weather_now["cnt"] then
                         weather.notification_text = weather.notification_text .. "\n"


@@ -132,7 +132,7 @@ local function worker(args)
     weather.attach(weather.widget)
 
     newtimer("weather-" .. city_id, timeout, weather.update)
     weather.attach(weather.widget)
 
     newtimer("weather-" .. city_id, timeout, weather.update)

-    newtimer("weather_forecast" .. city_id, timeout, weather.forecast_update)
+    newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update)

 
     return setmetatable(weather, { __index = weather.widget })
 end
 
     return setmetatable(weather, { __index = weather.widget })
 end