Merge lp:~macslow/unity-lens-music/unity-lens-music.fix-841902 into lp:unity-lens-music

[Mirco Müller]

Resubmitting to make sure it's meant to go into trunk. I wonder what made LP think I wanted to merge it to anything different than trunk initially.

The second part of the fix for LP: #841902.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks good (still ;-))

review: Approve

=== modified file 'src/banshee-filter-parser-genre.vala'
--- src/banshee-filter-parser-genre.vala	2011-09-14 18:33:52 +0000
+++ src/banshee-filter-parser-genre.vala	2012-01-18 08:14:25 +0000
@@ -26,7 +26,7 @@
 
     public BansheeGenreFilterParser (GenreFilterParser parser)
     {
-      base (parser.filter as CheckOptionFilter);
+      base (parser.filter as CheckOptionFilterCompact);
     }
     
     public override string parse ()
@@ -55,4 +55,4 @@
       return builder.str;
     }
   }
-}
\ No newline at end of file
+}

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2011-09-22 00:12:38 +0000
+++ src/daemon.vala	2012-01-18 08:14:25 +0000
@@ -71,7 +71,7 @@
 
       /* Genre filter */
       {
-        var filter = new CheckOptionFilter ("genre", _("Genre"));
+        var filter = new CheckOptionFilterCompact ("genre", _("Genre"));
         filter.sort_type = OptionsFilter.SortType.DISPLAY_NAME;
 
         filter.add_option (Genre.BLUES_ID, _("Blues"));

=== modified file 'src/filter-parser-genre.vala'
--- src/filter-parser-genre.vala	2011-09-28 18:44:11 +0000
+++ src/filter-parser-genre.vala	2012-01-18 08:14:25 +0000
@@ -23,7 +23,7 @@
   
   public class GenreFilterParser : FilterParser
   {
-    public GenreFilterParser (CheckOptionFilter filter)
+    public GenreFilterParser (CheckOptionFilterCompact filter)
     {
       base (filter);
       map = new Genre ();
@@ -39,7 +39,7 @@
 
     protected List<FilterOption> get_all_selected_genres ()
     {
-      unowned List<FilterOption> options = (filter as CheckOptionFilter).options;
+      unowned List<FilterOption> options = (filter as CheckOptionFilterCompact).options;
       var active = new List<FilterOption> ();
 
       foreach (FilterOption option in options)
@@ -51,4 +51,4 @@
       return active;
     }
   }
-}
\ No newline at end of file
+}

=== modified file 'src/musicstore-filter-parser-genre.vala'
--- src/musicstore-filter-parser-genre.vala	2011-09-28 18:44:11 +0000
+++ src/musicstore-filter-parser-genre.vala	2012-01-18 08:14:25 +0000
@@ -26,7 +26,7 @@
 
     public MusicStoreGenreFilterParser (GenreFilterParser parser)
     {
-      base (parser.filter as CheckOptionFilter);
+      base (parser.filter as CheckOptionFilterCompact);
     }
     
     public override string parse ()
@@ -49,4 +49,4 @@
       return builder.str;
     }
   }
-}
\ No newline at end of file
+}

=== modified file 'src/simple-scope.vala'
--- src/simple-scope.vala	2011-12-07 11:15:45 +0000
+++ src/simple-scope.vala	2012-01-18 08:14:25 +0000
@@ -99,7 +99,7 @@
       List<FilterParser> filters = new List<FilterParser> ();
       Filter filter = scope.get_filter ("genre");
       if (filter.filtering)
-	filters.append (new GenreFilterParser (filter as CheckOptionFilter));
+	filters.append (new GenreFilterParser (filter as CheckOptionFilterCompact));
 
       filter = scope.get_filter ("decade");
       if (filter.filtering)