Merge branch 'master' of https://github.com/copycat-killer/lain

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index c437347dbc7ffa514fb8600203cfd61b6b0364ea..5af898b482ff5dd1f97635fb5ab6e50bf004eced 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -71,7 +71,6 @@ local function worker(args)
                 for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") do
                     if     k == "state"   then mpd_now.state   = v
                     elseif k == "file"    then mpd_now.file    = v
-                    elseif k == "Name"    then mpd_now.name    = escape_f(v)
                     elseif k == "Artist"  then mpd_now.artist  = escape_f(v)
                     elseif k == "Title"   then mpd_now.title   = escape_f(v)
                     elseif k == "Album"   then mpd_now.album   = escape_f(v)

diff --git a/widgets/weather.lua b/widgets/weather.lua
index 68abae99ff195eebc94d8f6f52d76a5f695dd436..baf82d744e36d31ea61cda9542e54af76ad5729c 100644 (file)
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -30,7 +30,7 @@ local setmetatable = setmetatable
 local function worker(args)
     local weather               = {}
     local args                  = args or {}
-    local APPID                = args.APPID or 1 -- mandatory
+    local APPID                 = args.APPID or "3e321f9414eaedbfab34983bda77a66e" -- lain default
     local timeout               = args.timeout or 900   -- 15 min
     local timeout_forecast      = args.timeout or 86400 -- 24 hrs
     local current_call          = "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'"

diff --git a/wiki b/wiki
index d7aa1a7b8428211a1c4c71865fd64302e013d62b..35cc75dcb382fccdec6941698a1e96cc875fae1f 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit d7aa1a7b8428211a1c4c71865fd64302e013d62b
+Subproject commit 35cc75dcb382fccdec6941698a1e96cc875fae1f