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

[Carlos Jose Mazieri]

improved SmbUtil::findSmBServer()

improved SmbUtil::findSmBServer()

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

FAILED: Continuous integration, rev:480
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/18/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/58/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:480
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/565/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/187

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

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

review: Approve

=== modified file 'src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp'
--- src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp	2015-10-27 11:09:54 +0000
+++ src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp	2015-10-27 11:09:54 +0000
@@ -716,21 +716,25 @@
  */
 QString SmbUtil::findSmBServer(const smbc_dirent & dirent)
 {
-    QString host("localhost");
+    QString host;
     if (dirent.name[0] != 0)
     {
         QString name(dirent.name);
         host = name;
-        QString comment(dirent.comment);
-        if (!comment.isEmpty())
+    }
+    QString comment(dirent.comment);
+    if (!comment.isEmpty())
+    {
+        QString fullName = comment.split(QLatin1Char(' '), QString::SkipEmptyParts).first();
+        if (!fullName.isEmpty())
         {
-            QString fullName = comment.split(QLatin1Char(' '), QString::SkipEmptyParts).first();
-            if (!fullName.isEmpty() &&  fullName.startsWith(name), Qt::CaseSensitive)
-            {
-                host = fullName;
-            }
+            host = fullName;
         }
     }
+    if (host.isEmpty())
+    {
+        host = QLatin1String("localhost");
+    }
     return host.toLower();
 }