Merge lp:~mc-return/compiz/compiz.merge-shiftswitcher-one-if-statement-is-enough into lp:compiz/0.9.9

[MC Return]

Shift Switcher: Minor optimization: As we return in both cases one if statement is enough here (x2).

Thanks for the suggestion, Daniel :) - you are right of course.

[Sam Spilsbury (smspillaz)]

review: Approve

[Daniel van Vugt (vanvugt)]

If the intention is optimization then De Morgan's law [1] suggests there's a more efficient way with fewer operations:
    if (!(textAvailable && optionGetWindowTitle ()))
[1] http://en.wikipedia.org/wiki/De_Morgan's_laws

However I think the syntax you have already is more readable.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/53/console

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/shift/src/shift.cpp'
--- plugins/shift/src/shift.cpp	2012-10-24 09:33:31 +0000
+++ plugins/shift/src/shift.cpp	2012-11-01 11:21:22 +0000
@@ -139,10 +139,7 @@
 void
 ShiftScreen::renderWindowTitle ()
 {
-    if (!textAvailable)
-        return;
-
-    if (!optionGetWindowTitle ())
+    if (!textAvailable || !optionGetWindowTitle ())
         return;
 
     CompText::Attrib tA;
@@ -187,10 +184,7 @@
 void
 ShiftScreen::drawWindowTitle (const GLMatrix &transform)
 {
-    if (!textAvailable)
-        return;
-
-    if (!optionGetWindowTitle ())
+    if (!textAvailable || !optionGetWindowTitle ())
         return;
 
     float width, height, border = 10.0f;