#36 fix

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

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 4df3610db18364fdfb4b5fa63e3a6c3b97249928..febff2344979cfe27c589bdffd159036dd4225a1 100644 (file)
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -14,6 +14,7 @@ local wibox        = require("wibox")
 local io           = { popen  = io.popen }
 local string       = { format = string.format,
                        gsub   = string.gsub }
 local io           = { popen  = io.popen }
 local string       = { format = string.format,
                        gsub   = string.gsub }

+local tonumber     = tonumber

 
 local setmetatable = setmetatable
 
 
 local setmetatable = setmetatable
 


@@ -47,12 +48,12 @@ local function worker(args)
 
     imap.widget = wibox.widget.textbox('')
 
 
     imap.widget = wibox.widget.textbox('')
 

-    function imap.update()
-        notification_preset = {
+    function update()
+        mail_notification_preset = {

             icon     = helpers.icons_dir .. "mail.png",
             position = "top_left"
         }
             icon     = helpers.icons_dir .. "mail.png",
             position = "top_left"
         }

-        
+

         curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%s %s -k",
                head_command, server, port, mail, password, request)
 
         curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%s %s -k",
                head_command, server, port, mail, password, request)
 


@@ -60,26 +61,26 @@ local function worker(args)
         ws = f:read("*all")
         f:close()
 
         ws = f:read("*all")
         f:close()
 

-        t, mailcount = string.gsub(ws, "%d", "")
-        t = nil -- because it's useless
+        _, mailcount = string.gsub(ws, "%d+", "")
+        _ = nil

 
         widget = imap.widget
         settings()
 
 
         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
         then
             if mailcount == 1 then
                 nt = mail .. " has one new message"
             else
                 nt = mail .. " has <b>" .. mailcount .. "</b> new messages"
             end

-            naughty.notify({ preset = notification_preset, text = nt })
+            naughty.notify({ preset = mail_notification_preset, text = nt })

         end
 
         helpers.set_map(mail, mailcount)
     end
 
         end
 
         helpers.set_map(mail, mailcount)
     end
 

-    helpers.newtimer(mail, timeout, imap.update, true)
+    helpers.newtimer(mail, timeout, update, true)

     return imap.widget
 end
 
     return imap.widget
 end