Merge pull request #173 from guotsuan/master

To be compatible with the new functions in master branch of the awesome WM master

diff --git a/asyncshell.lua b/asyncshell.lua
index 2d6b7e3b116f26106426251385895a556735ae7d..a8e3676017168038797a9b28db8aeacec3299172 100644 (file)
--- a/asyncshell.lua
+++ b/asyncshell.lua
@@ -52,7 +52,11 @@ function asyncshell.request(command, callback, timeout)
         id, formatted_command
     )
 
-    awful.util.spawn_with_shell(req)
+    if type(awful.spawn) == 'table' then
+        awful.spawn.with_shell(req)
+    else
+        awful.util.spawn_with_shell(req)
+    end
 
     if timeout then
         asyncshell.request_table[id].timer = timer({ timeout = timeout })

diff --git a/helpers.lua b/helpers.lua
index 4ece329a6dc886f4e106ceb2711d1589a0a99334..5e958c3937e6d84fccf1a065a2d953b86f4da044 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -8,7 +8,7 @@
 
 local debug  = require("debug")
 
-local capi   = { timer = timer }
+local capi   = { timer = (type(timer) == 'table' and timer or require ("gears.timer")) }
 local io     = { open  = io.open,
                  lines = io.lines,
                  popen = io.popen }