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

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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
346. By James Henstridge

Merge from libunity7-compatible

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

There seem to be missing features here (local scopes are not displayed in "installed" category when doing empty search, sorting with the rest of the scopes, disabled local scopes in "more suggestions" category, etc), but what's in seems to work. +1

review: Approve

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: