X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/52deb6911957f840a0191f73c8a9626bd9ff5086..7dce46c34d7bf3e8ccdc03aa10d25d4df581326d:/widgets/imap.lua?ds=inline

diff --git a/widgets/imap.lua b/widgets/imap.lua
index ec7bd1f..06b4245 100644
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -12,7 +12,6 @@ local async        = require("lain.asyncshell")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
-local mouse        = mouse
 local string       = { format = string.format,
                        gsub   = string.gsub }
 local tonumber     = tonumber
@@ -33,7 +32,7 @@ local function worker(args)
     local port        = args.port or 993
     local timeout     = args.timeout or 60
     local is_plain    = args.is_plain or false
-    local followmouse = args.followmouse or false
+    local followtag   = args.followtag or false
     local settings    = args.settings or function() end
 
     local head_command  = "curl --connect-timeout 3 -fsm 3"
@@ -41,11 +40,8 @@ local function worker(args)
 
     helpers.set_map(mail, 0)
 
-    if not is_plain
-    then
-        local f = io.popen(password)
-        password = f:read("*all"):gsub("\n", "")
-        f:close()
+    if not is_plain then
+        password = helpers.read_pipe(password):gsub("\n", "")
     end
 
     imap.widget = wibox.widget.textbox('')
@@ -56,18 +52,15 @@ local function worker(args)
             position = "top_left"
         }
 
-        if followmouse then
-            mail_notification_preset.screen = mouse.screen
+        if followtag then
+            mail_notification_preset.screen = awful.screen.focused()
         end
 
         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("*all")
-            f:close()
-
-            _, mailcount = string.gsub(ws, "%d+", "")
+            _, mailcount = string.gsub(f, "%d+", "")
             _ = nil
 
             widget = imap.widget