Merge lp://staging/~jamesh/unity-scope-mediascanner/category-renderer-fixes into lp://staging/unity-scope-mediascanner
Proposed by
James Henstridge
Status: | Merged |
---|---|
Approved by: | Jussi Pakkanen |
Approved revision: | 61 |
Merged at revision: | 59 |
Proposed branch: | lp://staging/~jamesh/unity-scope-mediascanner/category-renderer-fixes |
Merge into: | lp://staging/unity-scope-mediascanner |
Prerequisite: | lp://staging/~jpakkane/unity-scope-mediascanner/videoaggregator |
Diff against target: |
167 lines (+44/-14) 7 files modified
data/mediascanner-music.ini.in (+1/-3) data/mediascanner-video.ini.in (+1/-3) data/music/mediascanner.scope.in (+1/-1) data/video/mediascanner.scope.in (+1/-1) data/videoaggregator.ini.in (+1/-1) src/music-scope.cpp (+20/-2) src/video-scope.cpp (+19/-3) |
To merge this branch: | bzr merge lp://staging/~jamesh/unity-scope-mediascanner/category-renderer-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Unity Team | Pending | ||
Review via email: mp+205936@code.staging.launchpad.net |
This proposal supersedes a proposal from 2014-02-12.
Commit message
Use a different category renderer when providing search results compared to the surfacing layout, and use less technical display names for the scopes.
Description of the change
Use a different category renderer when providing search results compared to the surfacing layout.
According to mhr3, this should use category-
I've also renamed the scopes so they show up with less technical names in the scopes scope.
To post a comment you must log in.
PASSED: Continuous integration, rev:59 jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- ci/53/ jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- trusty- amd64-ci/ 35 jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- trusty- armhf-ci/ 35 jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- trusty- i386-ci/ 35
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- scope-mediascan ner-ci/ 53/rebuild
http://