Merge lp://qastaging/~compiz-team/compiz/compiz.fix_1037142 into lp://qastaging/compiz/0.9.8

Unmerged revisions

3391. By Sam Spilsbury on 2012-09-22

Don't trigger the grid grab handler when expo is active, don't trigger
inactive actions and remove redundant checks for the root window match
because we don't support the multi-screen case and haven't since
0.9.0

3390. By Sam Spilsbury on 2012-09-21

Don't trigger actions unless they're actually added

3389. By Sam Spilsbury on 2012-09-21

Restrict access of private data in CompAction to a separate nonmember
function, add a test for its usage

3388. By Sam Spilsbury on 2012-09-21

Refactored out the rest of that function and tested it

3387. By Sam Spilsbury on 2012-09-21

Reworked the way actions are set up to be more in line with how
compiz expects it. Now the tests pass

3386. By Sam Spilsbury on 2012-09-21

Split out some of triggerButtonPressBindings and get it under test, currently
some tests fail due to incorrect behaviour in CompOption::set, a failing
test added to show this

3385. By Sam Spilsbury on 2012-09-21

Use boost::bind

3384. By Sam Spilsbury on 2012-09-21

Move the check for the button action modifiers & event state to a separate
function

3383. By Sam Spilsbury on 2012-09-21

Refactored out the edge detection code from triggerButtonPressBindings
into a separate util function under test