Merge pull request #296 from 2009/patch-2

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

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 5896ae11b764fa639628769ba63356511895c9ac..95d35fd0401617348b2ceb2b0a18e7e5516bcaa9 100644 (file)
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -11,14 +11,15 @@ local naughty      = require("naughty")
 local wibox        = require("wibox")
 local string       = { format = string.format,
                        gsub   = string.gsub }
 local wibox        = require("wibox")
 local string       = { format = string.format,
                        gsub   = string.gsub }

+local type         = type

 local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Mail IMAP check
 -- lain.widgets.imap
 
 local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Mail IMAP check
 -- lain.widgets.imap
 

-local function worker(args                           )
-    local imap      = helpers.make_widget_textbox()
+local function worker(args)
+    local imap      = { widget = wibox.widget.textbox() }

     local args      = args or {}
     local server    = args.server
     local mail      = args.mail
     local args      = args or {}
     local server    = args.server
     local mail      = args.mail


@@ -37,7 +38,11 @@ local function worker(args                           )
     helpers.set_map(mail, 0)
 
     if not is_plain then
     helpers.set_map(mail, 0)
 
     if not is_plain then

-        helpers.async(password, function(f) password = f:gsub("\n", "") end)
+        if type(password) == "string" or type(password) == "table" then
+            helpers.async(password, function(f) password = f:gsub("\n", "") end)
+        elseif type(password) == "function" then
+            local p = password()
+        end

     end
 
     function update()
     end
 
     function update()


@@ -76,7 +81,7 @@ local function worker(args                           )
 
     imap.timer = helpers.newtimer(mail, timeout, update, true, true)
 
 
     imap.timer = helpers.newtimer(mail, timeout, update, true, true)
 

-    return setmetatable(imap, { __index = imap.widget })
+    return imap

 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })