Merge pull request #3 from janx/master

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

diff --git a/widgets/fs.lua b/widgets/fs.lua
index b5800103673e7287880bacac9a47c85b305f162c..b43405604ef5efd5b88336b2020f964d04d6a9d6 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -27,7 +27,7 @@ local setmetatable = setmetatable
 local fs = {}
 
 local notification  = nil
 local fs = {}
 
 local notification  = nil

-notification_preset = { fg = beautiful.fg_normal }
+fs_notification_preset = { fg = beautiful.fg_normal }

 
 function fs:hide()
     if notification ~= nil then
 
 function fs:hide()
     if notification ~= nil then


@@ -44,7 +44,7 @@ function fs:show(t_out)
     f:close()
 
     notification = naughty.notify({
     f:close()
 
     notification = naughty.notify({

-        preset = notification_preset,
+        preset = fs_notification_preset,

         text = ws,
        timeout = t_out
     })
         text = ws,
        timeout = t_out
     })


@@ -63,8 +63,8 @@ local function worker(args)
 
     helpers.set_map("fs", false)
 
 
     helpers.set_map("fs", false)
 

-    function fs.update()
-        fs_info = {} 
+    function update()
+        fs_info = {}

 
         local f = io.popen("LC_ALL=C df -kP")
 
 
         local f = io.popen("LC_ALL=C df -kP")
 


@@ -95,7 +95,7 @@ local function worker(args)
 
         if used >= 99 and not helpers.get_map("fs")
         then
 
         if used >= 99 and not helpers.get_map("fs")
         then

-            naughty.notify({ 
+            naughty.notify({

                 title = "warning",
                 text = partition .. " ran out!\nmake some room",
                 timeout = 8,
                 title = "warning",
                 text = partition .. " ran out!\nmake some room",
                 timeout = 8,


@@ -108,20 +108,12 @@ local function worker(args)
         end
     end
 
         end
     end
 

-    helpers.newtimer(partition, timeout, fs.update)
+    helpers.newtimer(partition, timeout, update)

 
     widget:connect_signal('mouse::enter', function () fs:show(0) end)
     widget:connect_signal('mouse::leave', function () fs:hide() end)
 
 
     widget:connect_signal('mouse::enter', function () fs:show(0) end)
     widget:connect_signal('mouse::leave', function () fs:hide() end)
 

-    output = {
-        widget = fs.widget,
-        show = function(t_out)
-                  fs.update()
-                  fs:show(t_out)
-               end
-    }
-
-    return setmetatable(output, { __index = output.widget })
+    return setmetatable(fs, { __index = fs.widget })

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