unity-scopes-shell

Merge lp:~stolowski/unity-scopes-shell/fix-1370483 into lp:unity-scopes-shell

fix-1370483
Merge into trunk

Proposed by Paweł Stołowski on 2014-09-17

Status:

Merged

Approved by:

Pete Woods on 2014-09-17

Approved revision:

145

Merged at revision:

145

Proposed branch:

lp:~stolowski/unity-scopes-shell/fix-1370483

Merge into:

lp:unity-scopes-shell

Diff against target:

17 lines (+7/-1)

1 file modified

src/Unity/scope.cpp (+7/-1)

To merge this branch:

bzr merge lp:~stolowski/unity-scopes-shell/fix-1370483

Related bugs:

Bug #1354518: [dash] Scopes are empty until you go to them for the first time	Critical	Fix Released
Bug #1370483: Typing timeout breaks querying of all scopes on startup	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-09-17
Pete Woods (community)		2014-09-17	Approve on 2014-09-17
Review via email: mp+235006@code.launchpad.net

Commit message

Use typing timer only when scope is active, otherwise invalidate results and emit the signal for query change immediately.

Description of the change

Use typing timer only when scope is active, otherwise invalidate results and emit the signal for query change immediately. This is needed because Scopes::queryScopesOnStartup() calls dispatchSearch() immediately after setSearchQuery(), so delayed call to invalidatedResults() causes another search when scope becomes active (because results-dirty flag is set at this point).

Revision history for this message