clean failed rebase and repatch #160 2

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

diff --git a/widgets/sysload.lua b/widgets/sysload.lua
index 9472235e67d0d93d5541be48948639b76aef141a..d8e4713a77371088c2ac14693b1183b97ef4517a 100644 (file)
--- a/widgets/sysload.lua
+++ b/widgets/sysload.lua
@@ -7,7 +7,8 @@
                                                   
 --]]
 
-local helpers      = require("lain.helpers")
+local newtimer     = require("lain.helpers").newtimer
+
 local wibox        = require("wibox")
 
 local io           = { open = io.open }
@@ -21,13 +22,10 @@ local sysload = {}
 
 local function worker(args)
     local args = args or {}
-    local timeout = args.timeout or 1
+    local timeout = args.timeout or 2
     local settings = args.settings or function() end
 
     sysload.widget = wibox.widget.textbox('')
-    helpers.set_map("load_1", 0)
-    helpers.set_map("load_5", 0)
-    helpers.set_map("load_15", 0)
 
     function update()
         local f = io.open("/proc/loadavg")
@@ -36,21 +34,11 @@ local function worker(args)
 
         load_1, load_5, load_15 = string.match(ret, "([^%s]+) ([^%s]+) ([^%s]+)")
 
-        if load_1 ~= helpers.get_map("load_1")
-           or load_5 ~= helpers.get_map("load_5")
-           or load_15 ~= helpers.get_map("load_15")
-        then
-            widget = sysload.widget
-            settings()
-
-            helpers.set_map("load_1", load_1)
-            helpers.set_map("load_5", load_5)
-            helpers.set_map("load_15", load_15)
-        end
+        widget = sysload.widget
+        settings()
     end
 
-    helpers.newtimer("sysload", timeout, update)
-
+    newtimer("sysload", timeout, update)
     return sysload.widget
 end