]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

satisfied 'issue' #14
authorluke bonham <dadasignificanulla@gmail.com>
Mon, 2 Dec 2013 15:25:59 +0000 (16:25 +0100)
committerluke bonham <dadasignificanulla@gmail.com>
Mon, 2 Dec 2013 15:25:59 +0000 (16:25 +0100)
widgets/yawn/init.lua

index 7ab76fe75a417ea8ce4c1576385576bfd9838b7e..a2f756ede41b3259680e388e0277147e834f9a91 100644 (file)
@@ -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