]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge pull request #279 from renatofdds/patch-1
authorLuke Bonham <copycat-killer@users.noreply.github.com>
Tue, 24 Jan 2017 15:19:27 +0000 (16:19 +0100)
committerGitHub <noreply@github.com>
Tue, 24 Jan 2017 15:19:27 +0000 (16:19 +0100)
Fix regression in net.lua widget

1  2 
widgets/net.lua

diff --combined widgets/net.lua
index a6cb3b6ab31b3f307123c29931cbfa8b46898a20,e8583e0fb3abdcaea93ce9d499cc6bb9e6aaf732..bc9ad0c66d53f800192c5765fc184768949f6ae1
@@@ -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)
          settings()
      end
  
 -    helpers.newtimer(net.iface, timeout, update)
 +    helpers.newtimer("net-" .. tostring(net.iface), timeout, update)
  
      return net
  end