X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/dc614905b0e55d80fcf78f28f3454833d513837a..32eddd514f8ccc35eeaa128a441f6a47708e6a04:/widgets/net.lua

diff --git a/widgets/net.lua b/widgets/net.lua
index a6cb3b6..0b19f0b 100644
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -12,7 +12,6 @@ local naughty      = require("naughty")
 local wibox        = require("wibox")
 local string       = { format = string.format,
                        match  = string.match }
-local tostring     = tostring
 local setmetatable = setmetatable
 
 -- Network infos
@@ -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
-    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()
         helpers.async(string.format("ip link show", device_cmd), function(ws)
-            ws = ws:match("(%w+): <BROADCAST,MULTICAST,.-,UP,LOWER_UP>")
+            ws = ws:match("(%w+): <BROADCAST,MULTICAST,.-UP,LOWER_UP>")
             net.iface = ws and { ws } or {}
         end)
     end
@@ -117,9 +117,9 @@ local function worker(args)
         settings()
     end
 
-    helpers.newtimer("net-" .. tostring(net.iface), timeout, update)
+    helpers.newtimer("network", timeout, update)
 
-    return net
+    return setmetatable(net, { __index = net.widget })
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })