Merge lp://qastaging/~stolowski/unity-scope-home/new-query-on-activate into lp://qastaging/unity-scope-home
Status: | Merged |
---|---|
Approved by: | Michal Hruby |
Approved revision: | 153 |
Merged at revision: | 150 |
Proposed branch: | lp://qastaging/~stolowski/unity-scope-home/new-query-on-activate |
Merge into: | lp://qastaging/unity-scope-home |
Diff against target: |
164 lines (+52/-5) 9 files modified
configure.ac (+3/-2) data/Makefile.am (+1/-0) data/master-scopes/searchin.scope.in.in (+16/-0) debian/changelog (+6/-0) debian/control (+1/-1) src/scope.vala (+10/-0) src/smart-scopes-default-parser.vala (+4/-1) src/smart-scopes-more-suggestions-parser.vala (+4/-1) tests/fake-server/samples/search_results_with_query.txt (+7/-0) |
To merge this branch: | bzr merge lp://qastaging/~stolowski/unity-scope-home/new-query-on-activate |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Michal Hruby (community) | Approve | ||
Review via email:
|
Commit message
Handle Smart Scope Server responses that include alternative search queries.
Description of the change
Handle Smart Scope Server results that include suggestions for alternative search queries ("See also on..." etc.); the new special type of results uses "scopes-query://" uri prefix when returned by the server and gets remapped internally to "x-unity-
This requires libunity and Unity changes - see:
https:/
https:/
Please don't globally approve (pending design review).
FAILED: Continuous integration, rev:148 jenkins. qa.ubuntu. com/job/ unity-scope- home-ci/ 68/ jenkins. qa.ubuntu. com/job/ unity-scope- home-saucy- amd64-ci/ 32/console jenkins. qa.ubuntu. com/job/ unity-scope- home-saucy- armhf-ci/ 32/console jenkins. qa.ubuntu. com/job/ unity-scope- home-saucy- i386-ci/ 32/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ unity-scope- home-ci/ 68/rebuild
http://