Code review comment for lp:~mc-return/compiz/compiz.merge-shiftswitcher-one-if-statement-is-enough

1. compiz.merge-shiftswitcher-one-if-statement-is-enough
2. Merge into 0.9.9