#52 fix + multiple imap widgets feature added

diff --git a/widgets/base.lua b/widgets/base.lua
index 3d4ce9e41436c5f25da049ee5f9efa621c48b0aa..4f28e07bae46777f6733df0257463e6a80a727ff 100644 (file)
--- a/widgets/base.lua
+++ b/widgets/base.lua
@@ -14,9 +14,9 @@ local setmetatable = setmetatable
 
 -- Basic template for custom widgets 
 -- lain.widgets.base
-local base = {}
 
 local function worker(args)
+    local base     = {}
     local args     = args or {}
     local timeout  = args.timeout or 5
     local cmd      = args.cmd or ""
@@ -37,4 +37,4 @@ local function worker(args)
     return setmetatable(base, { __index = base.widget })
 end
 
-return setmetatable(base, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })

diff --git a/widgets/imap.lua b/widgets/imap.lua
index febff2344979cfe27c589bdffd159036dd4225a1..6104388ff01a406e5aa61e2725e7aaf7c89e5e7a 100644 (file)
--- 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
@@ -81,7 +81,7 @@ local function worker(args)
     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 })