Music Lens

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

  1. fix-972987
  2. Merge into trunk
Proposed by Aditya V
Status: Merged
Approved by: Michal Hruby
Approved revision: 79
Merged at revision: 125
Proposed branch: lp:~kroq-gar78/unity-lens-music/fix-972987
Merge into: lp:unity-lens-music
Diff against target: 40 lines (+6/-6)
2 files modified
src/daemon.vala (+1/-1)
src/genre.vala (+5/-5)
To merge this branch: bzr merge lp:~kroq-gar78/unity-lens-music/fix-972987
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+101165@code.launchpad.net

Commit message

Changed the "Classic" filter to "Classical"

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

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 updated
79. By Aditya V

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

Revision history for this message
Aditya V (kroq-gar78) wrote :

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

Revision history for this message
Michal Hruby (mhr3) wrote :

Great, thanks a lot!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/daemon.vala'
2--- src/daemon.vala 2012-09-13 16:43:44 +0000
3+++ src/daemon.vala 2012-12-24 07:39:22 +0000
4@@ -87,7 +87,7 @@
5 filter.sort_type = OptionsFilter.SortType.DISPLAY_NAME;
6
7 filter.add_option (Genre.BLUES_ID, _("Blues"));
8- filter.add_option (Genre.CLASSIC_ID, _("Classic"));
9+ filter.add_option (Genre.CLASSICAL_ID, _("Classical"));
10 filter.add_option (Genre.COUNTRY_ID, _("Country"));
11 filter.add_option (Genre.DISCO_ID, _("Disco"));
12 filter.add_option (Genre.FUNK_ID, _("Funk"));
13
14=== modified file 'src/genre.vala'
15--- src/genre.vala 2012-04-10 16:33:20 +0000
16+++ src/genre.vala 2012-12-24 07:39:22 +0000
17@@ -24,7 +24,7 @@
18 public class Genre : GLib.Object
19 {
20 public static const string BLUES_ID = "blues";
21- public static const string CLASSIC_ID = "classic";
22+ public static const string CLASSICAL_ID = "classical";
23 public static const string COUNTRY_ID = "country";
24 public static const string DISCO_ID = "disco";
25 public static const string FUNK_ID = "funk";
26@@ -52,10 +52,10 @@
27 /* blues */
28 map.set (BLUES_ID, "blues");
29
30- /* classic */
31- map.set (CLASSIC_ID, "classic");
32- map.set (CLASSIC_ID, "classical");
33- map.set (CLASSIC_ID, "opera");
34+ /* classical */
35+ map.set (CLASSICAL_ID, "classic");
36+ map.set (CLASSICAL_ID, "classical");
37+ map.set (CLASSICAL_ID, "opera");
38
39 /* country */
40 map.set (COUNTRY_ID, "country");

Subscribers

People subscribed via source and target branches

to all changes: