small fixes

[etc/awesome.git] / widgets / yawn / init.lua

diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua
index 86a2d0fe2979f38cf1acd8ca481cd161c441f424..148f547524cd92dc217caa618cfa6b36f16c129e 100644 (file)
--- a/widgets/yawn/init.lua
+++ b/widgets/yawn/init.lua
@@ -36,7 +36,7 @@ local localizations_path  = project_path .. 'localizations/'
 local icon_path           = project_path .. 'icons/'
 local api_url             = 'http://weather.yahooapis.com/forecastrss'
 local units_set           = '?u=c&w=' -- Default is Celsius
 local icon_path           = project_path .. 'icons/'
 local api_url             = 'http://weather.yahooapis.com/forecastrss'
 local units_set           = '?u=c&w=' -- Default is Celsius

-local language            = string.match(os.getenv("LANG"), "(%S*$*)[.]")
+local language            = string.match(os.getenv("LANG"), "(%S*$*)[.]") or "en_US" -- if LANG is not set

 local weather_data        = nil
 local notification        = nil
 local city_id             = nil
 local weather_data        = nil
 local notification        = nil
 local city_id             = nil


@@ -48,7 +48,7 @@ yawn_notification_preset = {}
 local function fetch_weather()
     local url = api_url .. units_set .. city_id
     local f = io.popen("curl --connect-timeout 1 -fsm 3 '" .. url .. "'" )
 local function fetch_weather()
     local url = api_url .. units_set .. city_id
     local f = io.popen("curl --connect-timeout 1 -fsm 3 '" .. url .. "'" )

-    local text = f:read("*all")
+    local text = f:read("*a")

     f:close()
 
     -- In case of no connection or invalid city ID
     f:close()
 
     -- In case of no connection or invalid city ID


@@ -161,7 +161,8 @@ function yawn.show(t_out)
         preset = yawn_notification_preset,
         text = weather_data,
         icon = sky,
         preset = yawn_notification_preset,
         text = weather_data,
         icon = sky,

-        timeout = t_out
+        timeout = t_out,
+        screen = client.focus and client.focus.screen or 1

     })
 end
 
     })
 end