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

Proposed by Carlos Jose Mazieri on 2015-10-04
Status: Merged
Approved by: Arto Jalkanen on 2015-10-20
Approved revision: 474
Merged at revision: 484
Proposed branch: lp:~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-01
Merge into: lp:ubuntu-filemanager-app
Diff against target: 17 lines (+7/-0)
1 file modified
src/plugin/folderlistmodel/net/netauthenticationdata.cpp (+7/-0)
To merge this branch: bzr merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-01
Reviewer Review Type Date Requested Status
Arto Jalkanen 2015-10-04 Approve on 2015-10-20
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-10-05
Review via email: mp+273333@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
review: Approve (continuous-integration)
Arto Jalkanen (ajalkane) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/plugin/folderlistmodel/net/netauthenticationdata.cpp'
2--- src/plugin/folderlistmodel/net/netauthenticationdata.cpp 2015-03-01 15:32:42 +0000
3+++ src/plugin/folderlistmodel/net/netauthenticationdata.cpp 2015-10-04 15:43:35 +0000
4@@ -78,6 +78,13 @@
5 if (!url.isEmpty())
6 {
7 ret = m_urlEntries.value(url);
8+ if (ret == 0)
9+ {
10+ //try to match cases where a more complete URL like smb://host/share/directory was entered and smb://host had been saved before
11+ QUrl hostUrl(url);
12+ hostUrl.setPath(QLatin1String(0));
13+ ret = m_urlEntries.value(hostUrl.toString());
14+ }
15 }
16 return ret;
17 }

Subscribers

People subscribed via source and target branches