Merge lp:~fboucault/unity-2d/blueish_images into lp:~unity-2d-team/unity-2d/maverick-old

[Florian Boucault]

[dash & spread] Do not call QApplication::setColorSpec(QApplication::ManyColor) thus fixing wrong window colors (blueish) in spread.

[lp:~fboucault/unity-2d/blueish_images]

369. By Florian Boucault on 2011-01-18

Synchronised comment in places.cpp with spread.cpp.

[Ricardo Salveti (rsalveti)]

Minor changes and work as expected.

Tested on Efika I'm no longer getting blueish pixmaps when using spread.

review: Approve (code functional)

[Florian Boucault (fboucault)]

Are packaging bits ok here?

[Ricardo Salveti (rsalveti)]

It's also broken, but not something introduced by this merge request.

=== modified file 'places/app/places.cpp'
--- places/app/places.cpp	2010-12-24 11:02:49 +0000
+++ places/app/places.cpp	2011-01-18 03:52:13 +0000
@@ -114,13 +114,13 @@
 {
     /* Forcing graphics system to 'raster' instead of the default 'native'
        which on X11 is 'XRender'.
-       'XRender' defaults to using a TrueColor visual. We mimick that behaviour
-       with 'raster' by calling QApplication::setColorSpec.
+       'XRender' defaults to using a TrueColor visual. We do _not_ mimick that
+       behaviour with 'raster' by calling QApplication::setColorSpec because
+       of a bug where some pixmaps become blueish:
 
-       Reference: https://bugs.launchpad.net/upicek/+bug/674484
+       https://bugs.launchpad.net/unity-2d/+bug/689877
     */
     QApplication::setGraphicsSystem("raster");
-    QApplication::setColorSpec(QApplication::ManyColor);
     QApplication application(argc, argv);
 
     DashDeclarativeView view;

=== modified file 'spread/app/spread.cpp'
--- spread/app/spread.cpp	2010-12-21 16:19:08 +0000
+++ spread/app/spread.cpp	2011-01-18 03:52:13 +0000
@@ -37,13 +37,13 @@
 
     /* Forcing graphics system to 'raster' instead of the default 'native'
        which on X11 is 'XRender'.
-       'XRender' defaults to using a TrueColor visual. We mimick that behaviour
-       with 'raster' by calling QApplication::setColorSpec.
+       'XRender' defaults to using a TrueColor visual. We do _not_ mimick that
+       behaviour with 'raster' by calling QApplication::setColorSpec because
+       of a bug where some pixmaps become blueish:
 
-       Reference: https://bugs.launchpad.net/upicek/+bug/674484
+       https://bugs.launchpad.net/unity-2d/+bug/689877
     */
     QApplication::setGraphicsSystem("raster");
-    QApplication::setColorSpec(QApplication::ManyColor);
     QApplication application(argc, argv);
 
     SpreadView view;