#112 fix

[etc/awesome.git] / widgets / imap.lua

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 1dca87cddfc856c8350243e1fbbabcc741b50233..ea62cc7053e27e0471c2496df09887c1fd47bf2e 100644 (file)
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -34,7 +34,7 @@ local function worker(args)
     local is_plain = args.is_plain or false
     local settings = args.settings or function() end
 
-    local head_command  = "curl --connect-timeout 1 -fsm 3"
+    local head_command  = "curl --connect-timeout 3 -fsm 3"
     local request = "-X 'SEARCH (UNSEEN)'"
 
     helpers.set_map(mail, 0)
@@ -42,7 +42,7 @@ local function worker(args)
     if not is_plain
     then
         local f = io.popen(password)
-        password = f:read("*a"):gsub("\n", "")
+        password = f:read("*all"):gsub("\n", "")
         f:close()
     end
 
@@ -54,11 +54,11 @@ local function worker(args)
             position = "top_left"
         }
 
-        curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%s %s -k",
+        curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
                head_command, server, port, mail, password, request)
 
-        async.request(curl, function(f) 
-            ws = f:read("*a")
+        async.request(curl, function(f)
+            ws = f:read("*all")
             f:close()
 
             _, mailcount = string.gsub(ws, "%d+", "")
@@ -77,7 +77,6 @@ local function worker(args)
                 naughty.notify({
                     preset = mail_notification_preset,
                     text = nt,
-                    screen = client.focus and client.focus.screen or 1
                 })
             end