no need to set naughty.config.defaults as preset, because it's implicit; closes #290

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

diff --git a/widgets/net.lua b/widgets/net.lua
index ff1607517687226b8184c6e44c93f1d022cd82d3..302559ab32bbfc729e776e32a2d6ff812425c252 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -10,7 +10,6 @@
 local helpers      = require("lain.helpers")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 local helpers      = require("lain.helpers")
 local naughty      = require("naughty")
 local wibox        = require("wibox")

-local shell        = require("awful.util").shell

 local string       = { format = string.format,
                        match  = string.match }
 local setmetatable = setmetatable
 local string       = { format = string.format,
                        match  = string.match }
 local setmetatable = setmetatable


@@ -32,11 +31,12 @@ local function worker(args)
     local settings   = args.settings or function() end
 
     -- Compatibility with old API where iface was a string corresponding to 1 interface
     local settings   = args.settings or function() end
 
     -- Compatibility with old API where iface was a string corresponding to 1 interface

-    net.iface = (args.iface and type(args.iface) == "string" and {args.iface}) or {}
+    net.iface = (args.iface and (type(args.iface) == "string" and {args.iface}) or
+                (type(args.iface) == "table" and args.iface)) or {}

 
     function net.get_device()
 
     function net.get_device()

-        helpers.async(string.format("%s -c 'ip link show'", shell, device_cmd), function(ws)
-            ws = ws:match("(%w+): <BROADCAST,MULTICAST,.-,UP,LOWER_UP>")
+        helpers.async(string.format("ip link show", device_cmd), function(ws)
+            ws = ws:match("(%w+): <BROADCAST,MULTICAST,.-UP,LOWER_UP>")

             net.iface = ws and { ws } or {}
         end)
     end
             net.iface = ws and { ws } or {}
         end)
     end


@@ -117,7 +117,7 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 

-    helpers.newtimer(net.iface, timeout, update)
+    helpers.newtimer("network", timeout, update)

 
     return net
 end
 
     return net
 end