Merge lp://qastaging/~jamesh/unity-lens-applications/index-local-scopes into lp://qastaging/~unity-team/unity-lens-applications/libunity7-compatible
Proposed by
James Henstridge
Status: | Merged |
---|---|
Approved by: | Michal Hruby |
Approved revision: | 346 |
Merged at revision: | 341 |
Proposed branch: | lp://qastaging/~jamesh/unity-lens-applications/index-local-scopes |
Merge into: | lp://qastaging/~unity-team/unity-lens-applications/libunity7-compatible |
Diff against target: |
574 lines (+254/-35) 11 files modified
configure.ac (+7/-0) src/Makefile.am (+2/-1) src/config.vala.in (+3/-1) src/daemon.vala (+116/-17) src/unity-package-search.cc (+106/-5) src/unity-package-search.h (+3/-0) src/xapian-utils.vala (+4/-4) tests/unit/Makefile.am (+2/-0) tests/unit/test-xapian-utils.vala (+7/-7) vapi/unity-package-search.deps (+1/-0) vapi/unity-package-search.vapi (+3/-0) |
To merge this branch: | bzr merge lp://qastaging/~jamesh/unity-lens-applications/index-local-scopes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michal Hruby (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Index local scopes and include them in the search results.
Description of the change
Index local scopes and include them in the search results.
This branch adds locally installed scopes to the search results from the applications scope.
If the software-center index includes scopes, it will also remove installed scopes from the "more suggestions" category of the results.
Most of the preview code is shared between local and remote scopes, with the enable/disable preview action updating the same dconf key (from chats with mhr3, this is the way we want to handle disabling of local scopes too).
To post a comment you must log in.
FAILED: Continuous integration, rev:345 jenkins. qa.ubuntu. com/job/ unity-team- unity-lens- applications- libunity7- compatible- ci/6/ jenkins. qa.ubuntu. com/job/ unity-team- unity-lens- applications- libunity7- compatible- raring- amd64-ci/ 6/console
http://
Executed test runs:
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ unity-team- unity-lens- applications- libunity7- compatible- ci/6/rebuild
http://