Merge lp:~mc-return/compiz/compiz.merge-fix1179183-expo-inactive-viewports-saturation-setting-is-ignored into lp:compiz/0.9.10

[MC Return]

Expo plugin:
Fixed inactive viewports saturation setting being ignored.
Let's "fade to grey"... :)

(LP: #1179183)

Note:
Expo still misses a cleanup.
For the sake of easy reviewability this MP contains just the fix for bug #1179183.
A general cleanup of Expo will follow soonish...

Note 2:
As requested here: https://code.launchpad.net/~mc-return/compiz/compiz.merge-fix1178965-expo-redundant-configuration-changes/+merge/163434/comments/361091 :)

[Sam Spilsbury (smspillaz)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2013-05-09 13:43:07 +0000
+++ plugins/expo/src/expo.cpp	2013-05-13 18:11:33 +0000
@@ -1214,9 +1214,15 @@
 	mask |= PAINT_SCREEN_CLEAR_MASK;
 
     if (optionGetExpoAnimation () == ExpoScreen::ExpoAnimationZoom)
+    {
 	vpBrightness = 0.0f;
+	vpSaturation = 0.0f;
+    }
     else
+    {
 	vpBrightness = (1.0f - sigmoidProgress (expoCam));
+	vpSaturation = (1.0f - sigmoidProgress (expoCam));
+    }
 
     if (expoCam <= 0 || (expoCam > 0.0 && expoCam < 1.0 &&
 			 optionGetExpoAnimation () != ExpoAnimationZoom))