quake: removed deprecations

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

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 350e1ad3e2d1eeeff9af366192afc1a680c6aeb3..06b42452da9f20dfe2f10a6fa66a74f108d15656 100644 (file)
--- 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 naughty      = require("naughty")
 local wibox        = require("wibox")
 

-local mouse        = mouse

 local string       = { format = string.format,
                        gsub   = string.gsub }
 local tonumber     = tonumber
 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 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"
     local settings    = args.settings or function() end
 
     local head_command  = "curl --connect-timeout 3 -fsm 3"


@@ -41,8 +40,7 @@ local function worker(args)
 
     helpers.set_map(mail, 0)
 
 
     helpers.set_map(mail, 0)
 

-    if not is_plain
-    then
+    if not is_plain then

         password = helpers.read_pipe(password):gsub("\n", "")
     end
 
         password = helpers.read_pipe(password):gsub("\n", "")
     end
 


@@ -54,8 +52,8 @@ local function worker(args)
             position = "top_left"
         }
 
             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",
         end
 
         curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",


@@ -65,10 +63,8 @@ local function worker(args)
             _, mailcount = string.gsub(f, "%d+", "")
             _ = nil
 
             _, mailcount = string.gsub(f, "%d+", "")
             _ = nil
 

-            if mailcount ~= helpers.get_map(mail) then
-                widget = imap.widget
-                settings()
-            end
+            widget = imap.widget
+            settings()

 
             if mailcount >= 1 and mailcount > helpers.get_map(mail)
             then
 
             if mailcount >= 1 and mailcount > helpers.get_map(mail)
             then