Merge lp:~jpakkane/unity-lens-music/remove-radios into lp:unity-lens-music

Proposed by Jussi Pakkanen
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 103
Merged at revision: 106
Proposed branch: lp:~jpakkane/unity-lens-music/remove-radios
Merge into: lp:unity-lens-music
Diff against target: 26 lines (+10/-6)
1 file modified
src/rhythmbox-collection.vala (+10/-6)
To merge this branch: bzr merge lp:~jpakkane/unity-lens-music/remove-radios
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
Review via email: mp+123923@code.launchpad.net

Commit message

Do not show Internet radio channels in music search results, because previews is not working for them.

Description of the change

Do not show Internet radio channels in music search results, because previews is not working for them.

To post a comment you must log in.
Revision history for this message
Paweł Stołowski (stolowski) wrote :

I think it's ok to disable radios when populating the resulting model, rather than in the xmlparser. It'll be easier to get the feature back in the future. Looking good to me.

review: Approve
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Approving with Pawel's comment, I'll revert it if the FFe/UIFe doesn't go through.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/rhythmbox-collection.vala'
--- src/rhythmbox-collection.vala 2012-08-17 09:11:28 +0000
+++ src/rhythmbox-collection.vala 2012-09-12 12:42:21 +0000
@@ -736,12 +736,16 @@
736 if (category_override >= 0)736 if (category_override >= 0)
737 category_id = category_override;737 category_id = category_override;
738738
739 add_result (helper_model, model, iter,739 // Do not show radios in Dash because previews
740 result_type, category_id);740 // is not working yet. Re-enable once this bug is fixed:
741741 // https://bugs.launchpad.net/unity-lens-music/+bug/1044325
742 num_results++;742 if (category_id != Category.RADIOS) {
743 if (max_results >= 0 && num_results >= max_results) break;743 add_result (helper_model, model, iter,
744744 result_type, category_id);
745
746 num_results++;
747 if (max_results >= 0 && num_results >= max_results) break;
748 }
745 iter = model.next (iter);749 iter = model.next (iter);
746 }750 }
747 return;751 return;

Subscribers

People subscribed via source and target branches

to all changes: