Merge lp:~kamstrup/unity-lens-music/gi-friendly-api-tweaks into lp:unity-lens-music

[Mikkel Kamstrup Erlandsen]

See attached bug. Reflect latest API breaks in libunity

[Neil J. Patel (njpatel)]

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2011-09-02 16:20:13 +0000
+++ src/daemon.vala	2011-09-08 13:18:43 +0000
@@ -52,7 +52,7 @@
 
     private void populate_filters ()
     {
-      Unity.Filter[] filters = {};
+      var filters = new GLib.List<Unity.Filter> ();
 
       /* Decade filter */
       {
@@ -66,7 +66,7 @@
         filter.add_option ("2000", _("00s"));
         filter.add_option ("2010", _("10s"));
 
-        filters += filter;
+        filters.append (filter);
       }
 
       /* Genre filter */
@@ -92,7 +92,7 @@
         filter.add_option (Genre.TECHNO_ID, _("Techno"));
         filter.add_option (Genre.OTHER_ID, _("Other"));
 
-        filters += filter;
+        filters.append (filter);
       }
 
       lens.filters = filters;
@@ -101,16 +101,20 @@
     // FIXME icons
     private void populate_categories ()
     {
-      Unity.Category[] categories = {};
-
-      var cat = new Unity.Category (_("Songs"), ICON_PATH + "group-songs.svg");
-      categories += cat;
-
-      cat =  new Unity.Category (_("Albums"), ICON_PATH + "group-albums.svg");
-      categories += cat;
-
-      cat = new Unity.Category (_("Available for Purchase"), ICON_PATH + "group-available.svg");
-      categories += cat;
+      var categories = new GLib.List<Unity.Category> ();
+      var icon_dir = File.new_for_path (ICON_PATH);
+
+      var cat = new Unity.Category (_("Songs"),
+                                    new FileIcon (icon_dir.get_child ("group-songs.svg")));
+      categories.append (cat);
+
+      cat =  new Unity.Category (_("Albums"),
+                                 new FileIcon (icon_dir.get_child ("group-albums.svg")));
+      categories.append (cat);
+
+      cat = new Unity.Category (_("Available for Purchase"),
+                                new FileIcon (icon_dir.get_child ("group-available.svg")));
+      categories.append (cat);
 
       lens.categories = categories;
     }