Merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-actions-10 into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

provided TrashLocation::urlBelongsToLocation()

TrashLocation::urlBelongsToLocation() should have been present in the previous MPs.

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

PASSED: Continuous integration, rev:441
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/515/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3100
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/231
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/137

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

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

Same note as in previous MP, hard-coded length of start of trash url would be best be a constant or logic in LocationUrl

review: Approve

=== modified file 'src/plugin/folderlistmodel/trash/trashlocation.cpp'
--- src/plugin/folderlistmodel/trash/trashlocation.cpp	2015-03-01 15:32:42 +0000
+++ src/plugin/folderlistmodel/trash/trashlocation.cpp	2015-07-19 15:32:02 +0000
@@ -314,3 +314,16 @@
     }
     return new TrashListWorker(trashDir, urlPath, filter);
 }
+
+
+QString TrashLocation::urlBelongsToLocation(const QString &urlPath, int indexOfColonAndSlashe)
+{
+    QString ret;
+#if defined(Q_OS_UNIX)
+    if (urlPath.startsWith(LocationUrl::TrashRootURL.midRef(0,6)))
+    {
+        ret  = LocationUrl::TrashRootURL + DirItemInfo::removeExtraSlashes(urlPath, indexOfColonAndSlashe+1);
+    }
+#endif
+    return ret;
+}
 
=== modified file 'src/plugin/folderlistmodel/trash/trashlocation.h'
--- src/plugin/folderlistmodel/trash/trashlocation.h	2015-03-01 15:32:42 +0000
+++ src/plugin/folderlistmodel/trash/trashlocation.h	2015-07-19 15:32:02 +0000
@@ -49,6 +49,7 @@
     virtual DirListWorker * newListWorker(const QString &urlPath,
                                           QDir::Filter filter,
                                           const bool isRecursive);
+    virtual QString     urlBelongsToLocation(const QString& urlPath, int indexOfColonAndSlashe);
 
     /*!
      * \brief getMovePairPaths() Get: original path and destination trash path