Merge lp:~kroq-gar78/unity-lens-music/fix-972987 into lp:unity-lens-music

[Aditya V]

Changed the "Classic" filter to "Classical"

I changed the "Classic" filter to "Classical" because everywhere I've been, I never really hear classical music being referred to as classic music. If you feel that it should be "Classic" and not "Classical", please reject this proposal.

[Michal Hruby (mhr3)]

We got a +1 from the design, could you please merge your branch with trunk? Currently there are conflicts.

review: Needs Fixing

[lp:~kroq-gar78/unity-lens-music/fix-972987]

79. By Aditya V on 2012-12-24

Merge lp:unity-lens-music to fix all merging conflicts

[Aditya V (kroq-gar78)]

Ok, I think I fixed all of the merging conflicts with lp:unity-lens-music :)

[Michal Hruby (mhr3)]

Great, thanks a lot!

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-09-13 16:43:44 +0000
+++ src/daemon.vala	2012-12-24 07:39:22 +0000
@@ -87,7 +87,7 @@
         filter.sort_type = OptionsFilter.SortType.DISPLAY_NAME;
 
         filter.add_option (Genre.BLUES_ID, _("Blues"));
-        filter.add_option (Genre.CLASSIC_ID, _("Classic"));
+        filter.add_option (Genre.CLASSICAL_ID, _("Classical"));
         filter.add_option (Genre.COUNTRY_ID, _("Country"));
         filter.add_option (Genre.DISCO_ID, _("Disco"));
         filter.add_option (Genre.FUNK_ID, _("Funk"));
 
=== modified file 'src/genre.vala'
--- src/genre.vala	2012-04-10 16:33:20 +0000
+++ src/genre.vala	2012-12-24 07:39:22 +0000
@@ -24,7 +24,7 @@
   public class Genre : GLib.Object
   {
     public static const string BLUES_ID = "blues";
-    public static const string CLASSIC_ID = "classic";
+    public static const string CLASSICAL_ID = "classical";
     public static const string COUNTRY_ID = "country";
     public static const string DISCO_ID = "disco";
     public static const string FUNK_ID = "funk";
@@ -52,10 +52,10 @@
       /* blues */
       map.set (BLUES_ID, "blues");
 
-      /* classic */
-      map.set (CLASSIC_ID, "classic");
-      map.set (CLASSIC_ID, "classical");
-      map.set (CLASSIC_ID, "opera");
+      /* classical */
+      map.set (CLASSICAL_ID, "classic");
+      map.set (CLASSICAL_ID, "classical");
+      map.set (CLASSICAL_ID, "opera");
 
       /* country */
       map.set (COUNTRY_ID, "country");