Merge pull request #2 from copycat-killer/master

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

diff --git a/widgets/mem.lua b/widgets/mem.lua
index e96dc1b735d1184a4ee4e3a32887015c6d813a3b..7b717ef7aca05e7e016b9fd5c3170017f10db9e2 100644 (file)
--- a/widgets/mem.lua
+++ b/widgets/mem.lua
@@ -7,7 +7,7 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local newtimer     = require("lain.helpers").newtimer
+local helpers      = require("lain.helpers")

 local wibox        = require("wibox")
 local gmatch       = string.gmatch
 local lines        = io.lines
 local wibox        = require("wibox")
 local gmatch       = string.gmatch
 local lines        = io.lines


@@ -25,7 +25,7 @@ local function worker(args)
 
     mem.widget = wibox.widget.textbox()
 
 
     mem.widget = wibox.widget.textbox()
 

-    function update()
+    function mem.update()

         mem_now = {}
         for line in lines("/proc/meminfo") do
             for k, v in gmatch(line, "([%a]+):[%s]+([%d]+).+") do
         mem_now = {}
         for line in lines("/proc/meminfo") do
             for k, v in gmatch(line, "([%a]+):[%s]+([%d]+).+") do


@@ -48,9 +48,9 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 

-    newtimer("mem", timeout, update)
+    helpers.newtimer("mem", timeout, mem.update)

 
 

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

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