X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6cce5b6fe11fe8c69b08140d645c604fef59e42a..d9877c4bedca550478507f268f43e137e4454c24:/widgets/imap.lua

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 0f8d994..5896ae1 100644
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -7,7 +7,6 @@
 --]]
 
 local helpers      = require("lain.helpers")
-local shell        = require("awful.util").shell
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 local string       = { format = string.format,
@@ -33,12 +32,12 @@ local function worker(args                           )
     local head_command = "curl --connect-timeout 3 -fsm 3"
     local request = "-X 'SEARCH (UNSEEN)'"
 
+    if not server or not mail or not password then return end
+
     helpers.set_map(mail, 0)
 
     if not is_plain then
-        helpers.async(string.format("%s -s '%s'", shell, password), function(f)
-            password = f:gsub("\n", "")
-        end)
+        helpers.async(password, function(f) password = f:gsub("\n", "") end)
     end
 
     function update()
@@ -51,8 +50,8 @@ local function worker(args                           )
             mail_notification_preset.screen = awful.screen.focused()
         end
 
-        curl = string.format("%s -c '%s --url imaps://%s:%s/INBOX -u %s:%q %s -k'",
-               shell, head_command, server, port, mail, password, request)
+        curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
+               head_command, server, port, mail, password, request)
 
         helpers.async(curl, function(f)
             _, mailcount = string.gsub(f, "%d+", "")
@@ -75,7 +74,7 @@ local function worker(args                           )
 
     end
 
-    helpers.newtimer(mail, timeout, update)
+    imap.timer = helpers.newtimer(mail, timeout, update, true, true)
 
     return setmetatable(imap, { __index = imap.widget })
 end