Merge pull request #303 from 2009/patch-4

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

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 8b62790104d287aa514cb556c707083e2493be0a..e479fd9b3413a1a38f6fe5d629cfbd2622a58c88 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -8,7 +8,6 @@
 --]]
 
 local first_line   = require("lain.helpers").first_line
 --]]
 
 local first_line   = require("lain.helpers").first_line

-local make_widget  = require("lain.helpers").make_widget_textbox

 local newtimer     = require("lain.helpers").newtimer
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 local newtimer     = require("lain.helpers").newtimer
 local naughty      = require("naughty")
 local wibox        = require("wibox")


@@ -26,7 +25,7 @@ local setmetatable = setmetatable
 -- lain.widgets.bat
 
 local function worker(args)
 -- lain.widgets.bat
 
 local function worker(args)

-    local bat       = make_widget()
+    local bat       = { widget = wibox.widget.textbox() }

     local args      = args or {}
     local timeout   = args.timeout or 30
     local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}
     local args      = args or {}
     local timeout   = args.timeout or 30
     local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}


@@ -176,8 +175,8 @@ local function worker(args)
     end
 
     newtimer("batteries", timeout, bat.update)
     end
 
     newtimer("batteries", timeout, bat.update)

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

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