Music Lens

Merge lp://qastaging/~mhr3/unity-lens-music/home-lenses into lp://qastaging/unity-lens-music

  1. home-lenses
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 76
Merged at revision: 69
Proposed branch: lp://qastaging/~mhr3/unity-lens-music/home-lenses
Merge into: lp://qastaging/unity-lens-music
Diff against target: 438 lines (+162/-92)
10 files modified
po/POTFILES.in (+1/-0)
po/POTFILES.skip (+1/-1)
src/Makefile.am (+1/-0)
src/banshee-collection.vala (+45/-11)
src/banshee-scope.vala (+14/-3)
src/categories.vala (+29/-0)
src/daemon.vala (+6/-0)
src/musicstore-collection.vala (+12/-9)
src/musicstore-scope.vala (+8/-6)
src/simple-scope.vala (+45/-62)
To merge this branch: bzr merge lp://qastaging/~mhr3/unity-lens-music/home-lenses
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Review via email: mp+89667@code.qastaging.launchpad.net

Description of the change

Changes to the lens to suit new home lens view - collate Songs and Albums into one category (displaying Albums first)

To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

There appears to be a merge conflict?

While you resolve it you might want to look at this nitpick:

102 + var iter = helper_model.get_first_iter ();
103 + while (iter != helper_model.get_last_iter ())

I usually add a helper variable 'var end = helper_model.get_last_iter ()' and do 'while (iter != end)'. This saves quite a bit of type checking.

review: Needs Fixing
Revision history for this message
Michal Hruby (mhr3) wrote :

Fixed.

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Awesome!

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-lens-music/6/console reported an error when processing this lp:~mhr3/unity-lens-music/home-lenses branch.
Not merging it.

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) :
review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-lens-music/6/console reported an error when processing this lp:~mhr3/unity-lens-music/home-lenses branch.
Not merging it.

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: