Merge lp:~carlos-mazieri/ubuntu-filemanager-app/open-remote-files-02 into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

improved DiskLocation::isThereDiskSpace() to work for files even they do not exist.

improved DiskLocation::isThereDiskSpace() to work for files even they do not exist.

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

PASSED: Continuous integration, rev:494
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/567/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/189

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

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:494
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/27/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/96/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/27/rebuild

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

One small improvement suggestion in comments.

review: Approve

=== modified file 'src/plugin/folderlistmodel/disk/disklocation.cpp'
--- src/plugin/folderlistmodel/disk/disklocation.cpp	2015-07-15 17:42:37 +0000
+++ src/plugin/folderlistmodel/disk/disklocation.cpp	2015-11-02 19:17:36 +0000
@@ -216,8 +216,15 @@
 {
     bool ret = true;
 #if defined(Q_OS_UNIX)
+    QFileInfo info(pathname);
+    bool   pathExists = info.exists();
+    while (!pathExists && info.absoluteFilePath() != QDir::rootPath())
+    {
+        info.setFile(info.absolutePath());
+        pathExists = info.exists();
+    }
     struct statvfs  vfs;
-    if ( ::statvfs( QFile::encodeName(pathname).constData(), &vfs) == 0 )
+    if ( ::statvfs( QFile::encodeName(info.absoluteFilePath()).constData(), &vfs) == 0 )
     {
         qint64 free =  vfs.f_bsize * vfs.f_bfree;
         ret = free > requiredSize;