Merge lp://qastaging/~davidc3/unity-lens-music/rb-scope into lp://qastaging/unity-lens-music

Proposed by David Callé
Status: Merged
Merged at revision: 73
Proposed branch: lp://qastaging/~davidc3/unity-lens-music/rb-scope
Merge into: lp://qastaging/unity-lens-music
Diff against target: 293 lines (+222/-1)
6 files modified
configure.ac (+1/-0)
src/Makefile.am (+3/-0)
src/daemon.vala (+3/-0)
src/rhythmbox-collection.vala (+104/-0)
src/rhythmbox-scope.vala (+109/-0)
src/track.vala (+2/-1)
To merge this branch: bzr merge lp://qastaging/~davidc3/unity-lens-music/rb-scope
Reviewer Review Type Date Requested Status
Michal Hruby (community) Needs Fixing
Review via email: mp+96822@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-03-07.

Description of the change

This branch adds a Rhythmbox scope, with basic search capabilities.

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote : Posted in a previous version of this proposal

First of all, can you please fix:

Text conflict in src/simple-scope.vala

208 + base.initialize ();
209 + Parser.init ();

Broken indentation.

248 + debug (@"Spawning rb '%s'", string.joinv (" ", exec));

Not a string template, please remove the @.

review: Needs Fixing
Revision history for this message
David Callé (davidc3) wrote :

Fixed. Sorry for the delay to answer this.

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

> Text conflict in src/simple-scope.vala

Still there :(

review: Needs Fixing
78. By David Callé

Resolve text conflict

Revision history for this message
David Callé (davidc3) wrote :

Conflict solved.

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

> Conflict solved.

Right, there's no longer a conflict but now it doesn't compile.

review: Needs Fixing
79. By David Callé

Fix a regression caused by a late merge

Revision history for this message
David Callé (davidc3) wrote :

It compiles now.

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: