Merge lp:~ajalkane/ubuntu-filemanager-app/home-folder-shown-with-content-picker into lp:ubuntu-filemanager-app

[Arto Jalkanen]

Bug 1378709: fixing FileManager to show home folder when launched as content picker.

Bug 1378709: fixing FileManager to show home folder when launched as content picker.

[Arto Jalkanen (ajalkane)]

Note that I couldn't test this change in either desktop nor on device due to various changes that have recently landed to the SDK and/or image. But it's pretty straightforward change.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:298
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/347/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/872
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/872/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/145

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/347/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Tested on a device and it works. The code change looks good to me, thanks!

review: Approve

=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml	2014-09-20 10:49:51 +0000
+++ src/app/qml/filemanager.qml	2014-10-10 22:29:44 +0000
@@ -149,7 +149,7 @@
 
         FolderListPage {
             // TODO: remember last selection
-            folder: "~"
+            folder: userplaces.locationHome
         }
     }