Merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-hostname-bug into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

Fixed a bug #1508504 related to get the Samba hostname.
It used to get the description instead of the name.
For some cases the name is the first word in the description, so it worked in some cases.

Fixed a bug #1508504 related to get the Samba hostname.
It used to get the description instead of the name.
For some cases the name is the first word in the description, so it worked in some cases.

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

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

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:499
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/573/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/195

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/573/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-11-02 20:30:00 +0000
+++ src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp	2015-11-08 12:30:55 +0000
@@ -363,8 +363,11 @@
     }
     else if (errno != EACCES && errno != ECONNREFUSED && slashes >= URL_SLASHES_NUMBER_FOR_SHARES) // perhaps is a file
     {
-        errno = 0;
-        ret = static_cast<SmbUtil::StatReturn> (getStat(context, smb_path,st));
+        errno = 0;        
+        if (getStat(context,smb_path,st) == 0)
+        {
+            ret = StatDone;
+        }
     }
 
     if (errno != 0)
@@ -722,13 +725,16 @@
         QString name(dirent.name);
         host = name;
     }
-    QString comment(dirent.comment);
-    if (!comment.isEmpty())
+    if (host.isEmpty())
     {
-        QString fullName = comment.split(QLatin1Char(' '), QString::SkipEmptyParts).first();
-        if (!fullName.isEmpty())
+        QString comment(dirent.comment);
+        if (!comment.isEmpty())
         {
-            host = fullName;
+            QString fullName = comment.split(QLatin1Char(' '), QString::SkipEmptyParts).first();
+            if (!fullName.isEmpty())
+            {
+                host = fullName;
+            }
         }
     }
     if (host.isEmpty())