Merge lp:~sjakthol/compiz/fix-fade-damaging into lp:compiz/0.9.10

[Sami Jaktholm]

Fade: Fix a typo that causes fade to constantly damage windows with a modified
      saturation.

What happens:
1) (Original) saturation is stored in newSaturation
2) saturation is updated
3) newSaturation (which was original saturation) is copied to saturation

In the end both saturation and newSaturation have the same value (the initial saturation). If an another plugin had changed the saturation, fAttrib.saturation != newSaturation and fade damages the window.

[MC Return (mc-return)]

LGTM.
+1. Great.

review: Approve

[Stephen M. Webb (bregma)]

Nice catch.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/fade/src/fade.cpp'
--- plugins/fade/src/fade.cpp	2013-05-09 13:43:07 +0000
+++ plugins/fade/src/fade.cpp	2013-05-21 13:25:31 +0000
@@ -252,10 +252,10 @@
 
 	    newSaturation = saturation;
 	    if (fAttrib.saturation > saturation)
-		saturation = MIN (saturation + (steps / 6),
+		newSaturation = MIN (saturation + (steps / 6),
 				  fAttrib.saturation);
 	    else if (fAttrib.saturation < saturation)
-		saturation = MAX (saturation - (steps / 6),
+		newSaturation = MAX (saturation - (steps / 6),
 				  fAttrib.saturation);
 	}
 	else if (mode == FadeOptions::FadeModeConstantTime)