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

Proposed by Marcus Tomlinson on 2016-02-08
Status: Merged
Approved by: Paweł Stołowski on 2016-02-10
Approved revision: 283
Merged at revision: 297
Proposed branch: lp:~marcustomlinson/unity-scopes-shell/lp-1537139
Merge into: lp:unity-scopes-shell
Diff against target: 16 lines (+2/-4)
1 file modified
src/Unity/scope.cpp (+2/-4)
To merge this branch: bzr merge lp:~marcustomlinson/unity-scopes-shell/lp-1537139
Reviewer Review Type Date Requested Status
Paweł Stołowski 2016-02-08 Approve on 2016-02-10
PS Jenkins bot (community) continuous-integration Needs Fixing on 2016-02-08
Review via email: mp+285307@code.launchpad.net

Commit message

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Unity/scope.cpp'
2--- src/Unity/scope.cpp 2015-11-30 09:23:32 +0000
3+++ src/Unity/scope.cpp 2016-02-08 08:51:48 +0000
4@@ -305,10 +305,8 @@
5
6 if (scope) {
7 scope->setCannedQuery(query);
8- // FIXME: implement better way to do multiple changes to search props and dispatch single search
9- if (!scope->searchInProgress()) {
10- scope->invalidateResults();
11- }
12+ scope->invalidateResults();
13+
14 if (scope != this) {
15 Q_EMIT gotoScope(scopeId);
16 } else {

Subscribers

People subscribed via source and target branches

to all changes: