]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

#198: correct logic
authorcopycat-killer <dada@archlinux.info>
Mon, 30 May 2016 19:01:44 +0000 (21:01 +0200)
committercopycat-killer <dada@archlinux.info>
Mon, 30 May 2016 19:01:44 +0000 (21:01 +0200)
widgets/pulsebar.lua
widgets/weather.lua

index 6955b0436961240282d042666af85b36f6e5e342..5004be6415e4608b3e7a20a36e5c64ccfadf7a6b 100644 (file)
@@ -1,10 +1,10 @@
 
 --[[
 
 --[[
-
-     Licensed under GNU General Public License v2
-      * (c) 2013, Luke Bonham
-      * (c) 2013, Rman
-
+                                                  
+     Licensed under GNU General Public License v2 
+      * (c) 2013, Luke Bonham                     
+      * (c) 2013, Rman                            
+                                                  
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
index 7ff498add77fea70203339e92d0d12cfa179b43b..75c23426990ff9ddbe3e1173e4ce019dd92a1b7f 100644 (file)
@@ -126,9 +126,9 @@ local function worker(args)
 
             if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
                 -- weather icon based on localtime
 
             if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
                 -- weather icon based on localtime
-                now     = os.time() - (utc * 3600)
-                sunrise = tonumber(weather_now["sys"]["sunrise"])
-                sunset  = tonumber(weather_now["sys"]["sunset"])
+                now     = os.time()
+                sunrise = tonumber(weather_now["sys"]["sunrise"]) + (utc * 3600)
+                sunset  = tonumber(weather_now["sys"]["sunset"]) + (utc * 3600)
                 icon    = weather_now["weather"][1]["icon"]
 
                 if sunrise <= now and now <= sunset then
                 icon    = weather_now["weather"][1]["icon"]
 
                 if sunrise <= now and now <= sunset then