Merge lp:~osomon/unity-2d/respectDesktopFileCase into lp:unity-2d/3.0

[Olivier Tilloy]

[dash] Do not store the URLs returned by the place daemons as QUrl objects, this converts the host name to lower case,
thus breaking the launch of application:// URLs containing uppercase letters (such as SearchAndRescue.desktop).

Note to the reviewer: I tested with SearchAndRescue (`apt-get install searchandrescue`), for which the applications place daemon doesn’t provide an icon: this is a separate issue, not addressed by this branch.

The important thing to test is that the application can now be launched from the dash, and more generally that this change doesn’t introduce regressions in launching applications and opening files and folders from the dash.

[Florian Boucault (fboucault)]

places/UnityFileInfoRenderer.qml needs to be adapted as well lines 21 and 33.

review: Needs Fixing

[Florian Boucault (fboucault)]

Forget that last comment that does not make sense.

Good to go!

(Tested using FBReader)

review: Approve

=== modified file 'launcher/UnityApplications/place.cpp'
--- launcher/UnityApplications/place.cpp	2011-03-10 09:41:12 +0000
+++ launcher/UnityApplications/place.cpp	2011-03-11 09:27:15 +0000
@@ -395,7 +395,12 @@
 
     if (url.scheme() == "application") {
         LauncherApplication application;
-        application.setDesktopFile(url.host());
+        /* Cannot set the desktop file to url.host(), because the QUrl constructor
+           converts the host name to lower case to conform to the Nameprep
+           RFC (see http://doc.qt.nokia.com/qurl.html#FormattingOption-enum).
+           Ref: http://bugs.launchpad.net/unity-2d/+bug/723604 */
+        QString desktopFile = uri.right(uri.size() - uri.indexOf("://") - 3);
+        application.setDesktopFile(desktopFile);
         application.activate();
         return;
     }

=== modified file 'places/RendererGrid.qml'
--- places/RendererGrid.qml	2011-02-21 21:04:36 +0000
+++ places/RendererGrid.qml	2011-03-11 09:27:15 +0000
@@ -124,7 +124,7 @@
                 height: results.cellHeight
 
                 Loader {
-                    property url uri: column_0
+                    property string uri: column_0
                     property string iconHint: column_1
                     property string groupId: column_2
                     property string mimetype: column_3

=== modified file 'places/UnityDefaultRenderer.qml'
--- places/UnityDefaultRenderer.qml	2011-03-09 15:50:03 +0000
+++ places/UnityDefaultRenderer.qml	2011-03-11 09:27:15 +0000
@@ -8,7 +8,7 @@
 
     cellRenderer: Component {
         Button {
-            property url uri
+            property string uri
             property string iconHint
             property string mimetype
             property string displayName
@@ -16,7 +16,7 @@
 
             onClicked: {
                 dashView.active = false
-                placeEntryModel.place.activate(decodeURIComponent(uri.toString()))
+                placeEntryModel.place.activate(decodeURIComponent(uri))
             }
 
             Image {