Merge lp:~marcustomlinson/unity-scopes-shell/lp-1537139 into lp:unity-scopes-shell

[Marcus Tomlinson]

The "FIXME" in Scope::executeCannedQuery() is no longer necessary since scope->invalidateResults() itself now ensures that there is only ever one search is in progress.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:283
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/409/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/103
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/103/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/103
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/66/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/66/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/66/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/409/rebuild

review: Needs Fixing (continuous-integration)

[Paweł Stołowski (stolowski)]

Yeah, I think this is the right thing to do. Thanks!

review: Approve

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2015-11-30 09:23:32 +0000
+++ src/Unity/scope.cpp	2016-02-08 08:51:48 +0000
@@ -305,10 +305,8 @@
 
     if (scope) {
         scope->setCannedQuery(query);
-        // FIXME: implement better way to do multiple changes to search props and dispatch single search
-        if (!scope->searchInProgress()) {
-            scope->invalidateResults();
-        }
+        scope->invalidateResults();
+
         if (scope != this) {
             Q_EMIT gotoScope(scopeId);
         } else {