imap: password can now be a string, a table or a function to execute

diff --git a/helpers.lua b/helpers.lua
index e65e3fb2d55ebcf87ef17f0b124877fa91afb65e..0305722bf99fb0cd170c25ff58873c74fb9b3108 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -177,10 +177,10 @@ function helpers.spairs(t)
     end
 end
 
--- create a textbox with no spacing issues
+-- create a lain textbox
 function helpers.make_widget_textbox()
-    local w = wibox.widget.textbox()
-    return setmetatable({ widget = w }, { __index = w })
+    local w = { widget = wibox.widget.textbox() }
+    return setmetatable(w, { __index = w.widget })
 end
 
 -- }}}

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 4be63dd67a9bafe663919cf64559da97f43d9a55..770a1bc8b3d6f07a30b33794dce761a4a156ffff 100644 (file)
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -11,6 +11,7 @@ local naughty      = require("naughty")
 local wibox        = require("wibox")
 local string       = { format = string.format,
                        gsub   = string.gsub }
+local type         = type
 local tonumber     = tonumber
 local setmetatable = setmetatable
 
@@ -37,7 +38,11 @@ local function worker(args)
     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()

diff --git a/wiki b/wiki
index f086b95e51c31b6fc1fda4591aa8eaf587cc064f..0af22b80f8dda896a0c8fefd5c7e52413294967d 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit f086b95e51c31b6fc1fda4591aa8eaf587cc064f
+Subproject commit 0af22b80f8dda896a0c8fefd5c7e52413294967d