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

[Jussi Pakkanen]

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

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

[Paweł Stołowski (stolowski)]

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

[Timo Jyrinki (timo-jyrinki)]

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

=== 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 @@
                     if (category_override >= 0)
                       category_id = category_override;
 
-                    add_result (helper_model, model, iter,
-                                result_type, category_id);
-
-                    num_results++;
-                    if (max_results >= 0 && num_results >= max_results) break;
-
+                    // Do not show radios in Dash because previews
+                    // is not working yet. Re-enable once this bug is fixed:
+                    // https://bugs.launchpad.net/unity-lens-music/+bug/1044325
+                    if (category_id != Category.RADIOS) {
+                      add_result (helper_model, model, iter,
+                                  result_type, category_id);
+
+                      num_results++;
+                      if (max_results >= 0 && num_results >= max_results) break;
+                    }
                     iter = model.next (iter);
                 }
                 return;