Merge branch 'master' of github.com:copycat-killer/lain

[etc/awesome.git] / helpers.lua

diff --git a/helpers.lua b/helpers.lua
index 8fb794c1f0e1cb790d02f65e27fb80825ff85b53..b681cb0f510a37bb10aae57030859f71f41cc19c 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -8,6 +8,7 @@
 
 local debug  = require("debug")
 
 
 local debug  = require("debug")
 

+local assert = assert

 local capi   = { timer = (type(timer) == 'table' and timer or require ("gears.timer")) }
 local io     = { open  = io.open,
                  lines = io.lines,
 local capi   = { timer = (type(timer) == 'table' and timer or require ("gears.timer")) }
 local io     = { open  = io.open,
                  lines = io.lines,


@@ -61,9 +62,9 @@ end
 function helpers.lines_match(regexp, file)
        local lines = {}
        for index,line in pairs(helpers.lines_from(file)) do
 function helpers.lines_match(regexp, file)
        local lines = {}
        for index,line in pairs(helpers.lines_from(file)) do

-               if string.match(line, regexp) then 
+               if string.match(line, regexp) then

                        lines[index] = line
                        lines[index] = line

-               end  
+               end

        end
        return lines
 end
        end
        return lines
 end


@@ -93,9 +94,9 @@ function helpers.newtimer(_name, timeout, fun, nostart)
     local name = timeout
     if not helpers.timer_table[name] then
         helpers.timer_table[name] = capi.timer({ timeout = timeout })
     local name = timeout
     if not helpers.timer_table[name] then
         helpers.timer_table[name] = capi.timer({ timeout = timeout })

+        helpers.timer_table[name]:start()

     end
     helpers.timer_table[name]:connect_signal("timeout", fun)
     end
     helpers.timer_table[name]:connect_signal("timeout", fun)

-    helpers.timer_table[name]:start()

     if not nostart then
         helpers.timer_table[name]:emit_signal("timeout")
     end
     if not nostart then
         helpers.timer_table[name]:emit_signal("timeout")
     end