Merge remote-tracking branch 'upstream/master'

diff --git a/widgets/weather.lua b/widgets/weather.lua
index 7ff498add77fea70203339e92d0d12cfa179b43b..6143ca57a0e09578927cd035f51812972354fabc 100644 (file)
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -73,9 +73,8 @@ local function worker(args)
             weather.forecast_update()
         end
 
-
         weather.notification = naughty.notify({
-            text    = weather.notification_text,
+            text    = weather.current_text .. weather.notification_text,
             icon    = weather.icon_path,
             timeout = t_out,
             preset  = notification_preset
@@ -123,7 +122,7 @@ local function worker(args)
         async.request(cmd, function(f)
             local pos, err, icon
             weather_now, pos, err = json.decode(f, 1, nil)
-
+            weather.current_text=''
             if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
                 -- weather icon based on localtime
                 now     = os.time() - (utc * 3600)
@@ -140,6 +139,7 @@ local function worker(args)
                 weather.icon_path = icons_path .. icon .. ".png"
 
                 widget = weather.widget
+                weather.current_text = "Now:" .. weather_now["weather"][1]["description"] .. "\n"
                 settings()
             else
                 weather.icon_path = icons_path .. "na.png"