Merge remote-tracking branch 'blueyed/awful-rules-optional-callback'

This commit is contained in:
Uli Schlachter 2014-04-01 16:31:03 +02:00
commit afa50904fb
1 changed files with 5 additions and 3 deletions

View File

@ -197,7 +197,7 @@ end
--- Apply properties and callbacks to a client.
-- @param c The client.
-- @param props Properties to apply.
-- @param callbacks Callbacks to apply.
-- @param callbacks Callbacks to apply (optional).
function rules.execute(c, props, callbacks)
for property, value in pairs(props) do
if property ~= "focus" and type(value) == "function" then
@ -230,8 +230,10 @@ function rules.execute(c, props, callbacks)
end
-- Apply all callbacks.
for i, callback in pairs(callbacks) do
callback(c)
if callbacks then
for i, callback in pairs(callbacks) do
callback(c)
end
end
-- Do this at last so we do not erase things done by the focus