fixing typos

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

diff --git a/widgets/weather.lua b/widgets/weather.lua
index b074cff41d555701281be65ec79568525d73ae01..545e6d1a3c6ca6e7a6867150689f45c4e62100f9 100644 (file)
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -43,7 +43,7 @@ local function worker(args)
     local utc_offset            = args.utc_offset or
                                   function ()
                                       local now = os.time()
     local utc_offset            = args.utc_offset or
                                   function ()
                                       local now = os.time()

-                                      return os.difftime(now, os.time(os.date("!*t", now))) + (os.date("*t").isdst and 3600)
+                                      return os.difftime(now, os.time(os.date("!*t", now))) + ((os.date("*t").isdst and 1 or 0) * 3600)

                                   end
     local units                 = args.units or "metric"
     local lang                  = args.lang or "en"
                                   end
     local units                 = args.units or "metric"
     local lang                  = args.lang or "en"


@@ -108,7 +108,7 @@ local function worker(args)
             local pos, err
             weather_now, pos, err = json.decode(f, 1, nil)
 
             local pos, err
             weather_now, pos, err = json.decode(f, 1, nil)
 

-            if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
+            if not err and type(weather_now) == "table" and tonumber(weather_now["cod"]) == 200 then

                 weather.notification_text = ''
                 for i = 1, weather_now["cnt"] do
                     weather.notification_text = weather.notification_text ..
                 weather.notification_text = ''
                 for i = 1, weather_now["cnt"] do
                     weather.notification_text = weather.notification_text ..


@@ -128,7 +128,7 @@ local function worker(args)
             local pos, err, icon
             weather_now, pos, err = json.decode(f, 1, nil)
 
             local pos, err, icon
             weather_now, pos, err = json.decode(f, 1, nil)
 

-            if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
+            if not err and type(weather_now) == "table" and tonumber(weather_now["cod"]) == 200 then

                 -- weather icon based on localtime
                 local now     = os.time()
                 local sunrise = tonumber(weather_now["sys"]["sunrise"])
                 -- weather icon based on localtime
                 local now     = os.time()
                 local sunrise = tonumber(weather_now["sys"]["sunrise"])