Merge lp:~mardy/unity-2d/launcher-bg into lp:unity-2d

[Alberto Mardegan]

[launcher] Display GNOME background when running in non composite mode

Fix the loading of the background, as well as its positioning inside of the GnomeBackground QML item.

=== modified file 'libunity-2d-private/Unity2d/GnomeBackground.qml'
--- libunity-2d-private/Unity2d/GnomeBackground.qml	2011-09-21 12:19:17 +0000
+++ libunity-2d-private/Unity2d/GnomeBackground.qml	2011-10-21 08:40:30 +0000
@@ -82,8 +82,12 @@
         height: screen.geometry.height
 
         smooth: true
-        x: screen.availableGeometry.x - declarativeView.globalPosition.x
-        y: -screen.availableGeometry.y
+
+        /* by default, place the background on top of the desktop background,
+           no matter where the DeclarativeView or the parent object are placed.
+        */
+        x: parent.mapFromItem(null, -declarativeView.globalPosition.x, 0).x
+        y: parent.mapFromItem(null, 0, -declarativeView.globalPosition.y).y
 
         /* Possible modes are:
             - "wallpaper"
 
=== modified file 'libunity-2d-private/src/blendedimageprovider.cpp'
--- libunity-2d-private/src/blendedimageprovider.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/blendedimageprovider.cpp	2011-10-21 08:40:30 +0000
@@ -45,7 +45,9 @@
 
     /* Merge baseUrl with fileName. If fileName is an absolute path, the result
        will be fileName itself. */
-    fileName = m_baseUrl.resolved(QUrl::fromLocalFile(fileName)).toLocalFile();
+    QUrl unresolved = fileName.startsWith("file:") ?
+        QUrl(fileName) : QUrl::fromLocalFile(fileName);
+    fileName = m_baseUrl.resolved(unresolved).toLocalFile();
 
     QString colorName = list[2];
     if (!QColor::isValidColor(colorName)) {