Be more explicit about function signature

This is not a big change, but it the function signature is more readable this way.
Merge pull request #567 from miohtama/master

Be more explicit about function signature of toolbar callback