Merge pull request #282 from 2009/patch-1

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

diff --git a/widgets/net.lua b/widgets/net.lua
index 24577488667aed683b8c341a5ea096cd2a291889..922e5e18a19a6b3f573b1e2b79a0f81c18c739d3 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -12,6 +12,7 @@ local naughty      = require("naughty")
 local wibox        = require("wibox")
 local string       = { format = string.format,
                        match  = string.match }
 local wibox        = require("wibox")
 local string       = { format = string.format,
                        match  = string.match }

+local tostring     = tostring

 local setmetatable = setmetatable
 
 -- Network infos
 local setmetatable = setmetatable
 
 -- Network infos


@@ -31,7 +32,8 @@ 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()
         helpers.async(string.format("ip link show", device_cmd), function(ws)
 
     function net.get_device()
         helpers.async(string.format("ip link show", device_cmd), function(ws)


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

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

 
     return net
 end
 
     return net
 end