Merge lp:~3v1n0/compiz/scale-focus-fix into lp:compiz/0.9.11

[Marco Trevisan (Treviño)]

Scale: don't try to re-focus an already focused window

This might make moveInputFocusTo to get stuck on X calls

Scale seems to try to set the input focus on the same window repeatedly when quickly invoked or relayouted, this makes the window to stuck at X calls (not sure if actually it would be better to avoid to try to focus an already focused at global level, always).

[Christopher Townsend (townsend)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3836
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/42

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/42/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2014-02-17 03:06:55 +0000
+++ plugins/scale/src/scale.cpp	2014-03-04 14:35:09 +0000
@@ -1487,7 +1487,8 @@
 	lastActiveNum    = focus->activeNum ();
 	lastActiveWindow = focus->id ();
 
-	focus->moveInputFocusTo ();
+	if (!focus->focused ())
+	    focus->moveInputFocusTo ();
     }
 }