Merge branch 'master' of github.com:trap000d/lain

	modified:   widgets/weather.lua

diff --cc widgets/weather.lua
index 6143ca57a0e09578927cd035f51812972354fabc,df3404003b7134b5dde5bedc11ccae1f0cb8d53f..c684fe22583f51494ebf6d46b1ef8e4384cb693d
--- 1/widgets/weather.lua
--- 2/widgets/weather.lua
+++ b/widgets/weather.lua
@@@ -124,20 -125,18 +124,35 @@@ local function worker(args
              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
++<<<<<<< HEAD
 +                -- weather icon based on localtime
 +                now     = os.time() - (utc * 3600)
 +                sunrise = tonumber(weather_now["sys"]["sunrise"])
 +                sunset  = tonumber(weather_now["sys"]["sunset"])
 +                icon    = weather_now["weather"][1]["icon"]
 +
 +                if sunrise <= now and now <= sunset then
 +                    icon = string.gsub(icon, "n", "d")
++=======
+                 current_dt = os.time()
+                 sunrise = weather_now["sys"]["sunrise"]
+                 sunset  = weather_now["sys"]["sunset"]
+                 if current_dt> sunrise and current_dt> sunset then current_dt = current_dt - 86400 end
+                 if current_dt > sunrise and current_dt < sunset then 
+                     datetime="d"
++>>>>>>> e3a5dd623700b2cad423c8179141124e6e9b9027
                  else
 -                    datetime="n"
 +                    icon = string.gsub(icon, "d", "n")
                  end
++<<<<<<< HEAD
 +
 +                weather.icon_path = icons_path .. icon .. ".png"
 +
++=======
+                 -- error("dt sr:" .. sunrise .. "ss: " .. sunset .. "dt: " .. current_dt .. "d/n: " .. datetime .. "hehe")
+                 icon = weather_now["weather"][1]["icon"]
+                 weather.icon_path = icons_path .. icon:sub(1,2) .. datetime .. ".png"
++>>>>>>> e3a5dd623700b2cad423c8179141124e6e9b9027
                  widget = weather.widget
                  weather.current_text = "Now:" .. weather_now["weather"][1]["description"] .. "\n"
                  settings()