Merge lp:~mc-return/compiz/compiz.merge-fix1009999-shiftswitcher-ignores-setting-show-window-title into lp:compiz/0.9.9

[MC Return]

"Show Window Title" was always rendered, CCSM settings to disable the window title were ignored. Fixed this by adding checks to ShiftScreen::drawWindowTitle.

Minor optimization in ShiftScreen::renderWindowTitle: Do not create variables and call freeWindowTitle (), if the text plug-in is not available or window title rendering is disabled.

(LP: #1009999)

[Sam Spilsbury (smspillaz)]

review: Approve

[Daniel van Vugt (vanvugt)]

Works for me. Though I would have made it a single if statement each time.

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/46/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/46/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

I've cherry picked the revision that fixes the test failures from https://code.launchpad.net/~vanvugt/ubuntu/quantal/compiz/fix-1071238 , re-approving

review: Approve

=== modified file 'plugins/shift/src/shift.cpp'
--- plugins/shift/src/shift.cpp	2012-09-07 23:29:42 +0000
+++ plugins/shift/src/shift.cpp	2012-10-24 09:44:22 +0000
@@ -139,17 +139,17 @@
 void
 ShiftScreen::renderWindowTitle ()
 {
+    if (!textAvailable)
+        return;
+
+    if (!optionGetWindowTitle ())
+        return;
+
     CompText::Attrib tA;
     CompRect	     oe;
 
     freeWindowTitle ();
 
-    if (!textAvailable)
-        return;
-
-    if (!optionGetWindowTitle ())
-        return;
-
     if (optionGetMultioutputMode () ==
                                     ShiftOptions::MultioutputModeOneBigSwitcher)
     {
@@ -187,6 +187,12 @@
 void
 ShiftScreen::drawWindowTitle (const GLMatrix &transform)
 {
+    if (!textAvailable)
+        return;
+
+    if (!optionGetWindowTitle ())
+        return;
+
     float width, height, border = 10.0f;
     CompRect oe;