From: Luke Bonham <copycat-killer@users.noreply.github.com>
Date: Tue, 24 Jan 2017 15:19:27 +0000 (+0100)
Subject: Merge pull request #279 from renatofdds/patch-1
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/e64c1443d028749ba469def533efb075abd3d06b?hp=-c;pf=etc

Merge pull request #279 from renatofdds/patch-1

Fix regression in net.lua widget
---

e64c1443d028749ba469def533efb075abd3d06b
diff --combined widgets/net.lua
index a6cb3b6,e8583e0..bc9ad0c
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@@ -12,7 -12,6 +12,7 @@@ 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,7 -31,8 +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
-     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)
@@@ -117,7 -117,7 +118,7 @@@
          settings()
      end
  
 -    helpers.newtimer(net.iface, timeout, update)
 +    helpers.newtimer("net-" .. tostring(net.iface), timeout, update)
  
      return net
  end