Merge lp:~stolowski/unity-scope-home/canned-queries-session-id into lp:unity-scope-home
Proposed by
Paweł Stołowski
Status: | Merged |
---|---|
Approved by: | Michal Hruby |
Approved revision: | 167 |
Merged at revision: | 165 |
Proposed branch: | lp:~stolowski/unity-scope-home/canned-queries-session-id |
Merge into: | lp:unity-scope-home |
Diff against target: |
129 lines (+50/-19) 3 files modified
src/scope.vala (+4/-1) src/search-query-state.vala (+34/-18) tests/unit/test-home-scope.vala (+12/-0) |
To merge this branch: | bzr merge lp:~stolowski/unity-scope-home/canned-queries-session-id |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Michal Hruby (community) | Approve | ||
Review via email: mp+186506@code.launchpad.net |
Commit message
Reuse existing session_id for canned queries.
Description of the change
Added new CANNED_QUERY state to SearchQueryChange / SearchQueryState, so that we're able to reuse existing session_id for canned queries.
When a scopes-query:// item is activated, the activation handler sets a flag indicating that upcoming search query for current channel will be a canned query. Search request handler will then receive state == CANNED_QUERY when it calls query_state.
To post a comment you must log in.
PASSED: Continuous integration, rev:166 jenkins. qa.ubuntu. com/job/ unity-scope- home-ci/ 86/ jenkins. qa.ubuntu. com/job/ unity-scope- home-saucy- amd64-ci/ 50 jenkins. qa.ubuntu. com/job/ unity-scope- home-saucy- armhf-ci/ 50 jenkins. qa.ubuntu. com/job/ unity-scope- home-saucy- i386-ci/ 50
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ unity-scope- home-ci/ 86/rebuild
http://