X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/2c6a5794b20e757292825450557750df595d1868..4b634be781379140002b191b04e167a4460ae5f4:/widgets/imap.lua

diff --git a/widgets/imap.lua b/widgets/imap.lua
index b3f281d..c404032 100644
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -20,9 +20,9 @@ local setmetatable = setmetatable
 
 -- Mail IMAP check
 -- lain.widgets.imap
-local imap = {}
 
 local function worker(args)
+    local imap     = {}
     local args     = args or {}
 
     local server   = args.server
@@ -61,28 +61,31 @@ local function worker(args)
         ws = f:read("*all")
         f:close()
 
-        t, mailcount = string.gsub(ws, "%d", "")
-        t = nil 
-        mailcount = tonumber(mailcount)
+        _, mailcount = string.gsub(ws, "%d+", "")
+        _ = nil
 
         widget = imap.widget
         settings()
 
-        if mailcount > helpers.get_map(mail) and mailcount >= 1
+        if mailcount >= 1 and mailcount > helpers.get_map(mail)
         then
             if mailcount == 1 then
                 nt = mail .. " has one new message"
             else
                 nt = mail .. " has <b>" .. mailcount .. "</b> new messages"
             end
-            naughty.notify({ preset = mail_notification_preset, text = nt })
+            naughty.notify({
+                preset = mail_notification_preset,
+                text = nt,
+                screen = client.focus and client.focus.screen or 1
+            })
         end
 
         helpers.set_map(mail, mailcount)
     end
 
     helpers.newtimer(mail, timeout, update, true)
-    return imap.widget
+    return setmetatable(imap, { __index = imap.widget })
 end
 
-return setmetatable(imap, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })