From: luke bonham Date: Mon, 2 Dec 2013 15:25:59 +0000 (+0100) Subject: satisfied 'issue' #14 X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/4a29739e79486a5003218341a6bd10fa5df4cb8b?ds=sidebyside;pf=etc satisfied 'issue' #14 --- diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua index 7ab76fe..a2f756e 100644 --- a/widgets/yawn/init.lua +++ b/widgets/yawn/init.lua @@ -46,8 +46,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 1 '" - .. url .. "'" ) + local f = io.popen("curl --connect-timeout 1 -fsm 1 '" .. url .. "'" ) local text = f:read("*all") f:close() @@ -58,12 +57,12 @@ local function fetch_weather() yawn.icon:set_image(icon_path .. "na.png") if text == "" then weather_data = "Service not available at the moment." - yawn.widget:set_text("N/A") + yawn.widget:set_text(" N/A") else weather_data = "City not found!\n" .. "Are you sure " .. city_id .. " is your Yahoo city ID?" - yawn.widget:set_text("?") + yawn.widget:set_text(" ?") end return end @@ -75,7 +74,7 @@ local function fetch_weather() -- may still happens in case of bad connectivity if weather_data == "" then yawn.icon:set_image(icon_path .. "na.png") - yawn.widget:set_text("?") + yawn.widget:set_text(" ?") return end @@ -149,7 +148,7 @@ function yawn.hide() end function yawn.show(t_out) - if yawn.widget._layout.text == "?" + if yawn.widget._layout.text:match("?") then fetch_weather(settings) end