Merge lp://qastaging/~stolowski/unity-scope-home/new-query-on-activate into lp://qastaging/unity-scope-home

Proposed by Paweł Stołowski
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
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michal Hruby (community) Approve
Review via email: mp+181848@code.qastaging.launchpad.net

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-no-preview-scopes-query://" so that Unity doesn't respond to preview requests for them (Unity does activation for "x-unity-no-preview").

This requires libunity and Unity changes - see:
https://code.launchpad.net/~stolowski/libunity/new-query-on-activate/+merge/181844
https://code.launchpad.net/~stolowski/unity/new-query-on-activate/+merge/181845

Please don't globally approve (pending design review).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Michal Hruby (mhr3) wrote :

37 +unity-scope-home (6.8.1+13.10.20130809.1-0ubuntu2ppa1~saucy) UNRELEASED; urgency=low
38 +
39 + * Support for new search as an activation response.
40 +
41 + -- Pawel Stolowski <email address hidden> Fri, 16 Aug 2013 13:15:09 +0200
42 +

Double changelog entry?

149. By Paweł Stołowski

Fixed changelog.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
150. By Paweł Stołowski

Updated with .with_search.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
151. By Paweł Stołowski

Require libunity-7.1.0.

152. By Paweł Stołowski

Merged trunk.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
153. By Paweł Stołowski

Added 'Search in' master.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Michal Hruby (mhr3) wrote :

Not liking the very strange schema that the results are using, plus I'd like to see tests for encoding/escaping of the query schema. And I was promised to get these in a later merge (given this needs to be finalized on the server as well), so let's get this in.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: