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

[Carlos Jose Mazieri]

fixes the bug #1330223.

fixes the bug #1330223.

LocationsFactory::setNewPath() must return NULL when the item is a file.

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

FAILED: Continuous integration, rev:213
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/267/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/648/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/65/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:213
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/270/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/661
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/661/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/68

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

review: Approve (continuous-integration)

[Carlos Jose Mazieri (carlos-mazieri)]

I am approving myself since it is very simple.

review: Approve

=== modified file 'src/plugin/folderlistmodel/locationsfactory.cpp'
--- src/plugin/folderlistmodel/locationsfactory.cpp	2014-05-24 01:40:01 +0000
+++ src/plugin/folderlistmodel/locationsfactory.cpp	2014-06-25 22:58:09 +0000
@@ -131,6 +131,7 @@
             else
             {
                 storeValidFileInfo(item);
+                location = 0;
             }
         }
         else