pass -M to amixer in alsabar

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

diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua
index 3f08cd5956e261eb4e2364d7e3ace5e164ce4519..da2b856f033483329b9bccccb8bc1f6fd3c83674 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


@@ -135,7 +135,8 @@ local function fetch_weather()
     yawn.icon:set_image(sky)
     widget = yawn.widget
 
     yawn.icon:set_image(sky)
     widget = yawn.widget
 

-    forecast = weather_data:match(": %S.-,"):gsub(": ", ""):gsub(",", "")
+    _data = weather_data:match(": %S.-,") or weather_data
+    forecast = _data:gsub(": ", ""):gsub(",", "")

     units = units:gsub(" ", "")
 
     settings()
     units = units:gsub(" ", "")
 
     settings()


@@ -160,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