Merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-01 into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

Improved Authentication saving/using by trying the host only when there is no user/password for a such URL which has path

Improved Authentication saving/using by trying the host only when there is no user/password for a such URL which has path

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

PASSED: Continuous integration, rev:474
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/553/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/175

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

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

review: Approve

=== modified file 'src/plugin/folderlistmodel/net/netauthenticationdata.cpp'
--- src/plugin/folderlistmodel/net/netauthenticationdata.cpp	2015-03-01 15:32:42 +0000
+++ src/plugin/folderlistmodel/net/netauthenticationdata.cpp	2015-10-04 15:43:35 +0000
@@ -78,6 +78,13 @@
     if (!url.isEmpty())
     {
         ret = m_urlEntries.value(url);
+        if (ret == 0)
+        {
+            //try to match cases where a more complete URL like smb://host/share/directory was entered and smb://host had been saved before
+            QUrl hostUrl(url);
+            hostUrl.setPath(QLatin1String(0));
+            ret =  m_urlEntries.value(hostUrl.toString());
+        }
     }
     return ret;
 }