Music Lens

Merge lp:~3v1n0/unity-lens-music/preview-icon-fix into lp:unity-lens-music

  1. preview-icon-fix
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Brandon Schaefer
Approved revision: 150
Merged at revision: 152
Proposed branch: lp:~3v1n0/unity-lens-music/preview-icon-fix
Merge into: lp:unity-lens-music
Diff against target: 54 lines (+4/-5)
3 files modified
m4/gcov.m4 (+1/-1)
src/musicstore-scope.vala (+2/-3)
src/rhythmbox-collection.vala (+1/-1)
To merge this branch: bzr merge lp:~3v1n0/unity-lens-music/preview-icon-fix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+225906@code.launchpad.net

Commit message

Rhythmbox: Use proper unity icons paths for preview image

Description of the change

Unity lens music points to the old icons location, thus we don't get the proper results in unity previews.

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:150
http://jenkins.qa.ubuntu.com/job/unity-lens-music-ci/19/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-music-utopic-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-music-utopic-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-music-utopic-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-lens-music-ci/19/rebuild

review: Needs Fixing (continuous-integration)
lp:~3v1n0/unity-lens-music/preview-icon-fix updated
151. By Marco Trevisan (Treviño)

Add support for lcov 1.11

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:151
http://jenkins.qa.ubuntu.com/job/unity-lens-music-ci/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-music-utopic-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-music-utopic-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-music-utopic-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-lens-music-ci/20/rebuild

review: Needs Fixing (continuous-integration)
lp:~3v1n0/unity-lens-music/preview-icon-fix updated
152. By Marco Trevisan (Treviño)

MusicStore: remove ambiguity with GLib.Notification

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:152
http://jenkins.qa.ubuntu.com/job/unity-lens-music-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-utopic-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-utopic-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-lens-music-ci/21/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'm4/gcov.m4'
2--- m4/gcov.m4 2013-02-15 13:06:28 +0000
3+++ m4/gcov.m4 2014-07-08 16:11:03 +0000
4@@ -30,7 +30,7 @@
5 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
6 fi
7
8- lcov_version_list="1.6 1.7 1.8 1.9"
9+ lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11"
10 AC_CHECK_PROG(LCOV, lcov, lcov)
11 AC_CHECK_PROG(GENHTML, genhtml, genhtml)
12
13
14=== modified file 'src/musicstore-scope.vala'
15--- src/musicstore-scope.vala 2013-06-20 13:23:37 +0000
16+++ src/musicstore-scope.vala 2014-07-08 16:11:03 +0000
17@@ -18,7 +18,6 @@
18 */
19
20 using GLib;
21-using Notify;
22 using Unity;
23 using Gdk;
24 using Ubuntuone.Constants;
25@@ -37,7 +36,7 @@
26 private PreferencesManager preferences = PreferencesManager.get_default ();
27 private HashTable<string, Album> album_map;
28 private PurchaseService purchase_service;
29- private Notification notification;
30+ private Notify.Notification notification;
31
32 public MusicStoreScopeProxy ()
33 {
34@@ -54,7 +53,7 @@
35 base.initialize ();
36
37 Notify.init ("Music Store Scope");
38- notification = new Notification("Album name", _("Purchase started"), "");
39+ notification = new Notify.Notification("Album name", _("Purchase started"), "");
40 collection = new MusicStoreCollection ();
41 album_map = new HashTable<string, Album>(str_hash, str_equal);
42 purchase_service = new PurchaseService ();
43
44=== modified file 'src/rhythmbox-collection.vala'
45--- src/rhythmbox-collection.vala 2013-05-29 15:04:08 +0000
46+++ src/rhythmbox-collection.vala 2014-07-08 16:11:03 +0000
47@@ -23,7 +23,7 @@
48
49 namespace Unity.MusicLens
50 {
51- const string UNITY_ICON_PATH = Config.PKGDATADIR + "/6";
52+ const string UNITY_ICON_PATH = Config.PKGDATADIR + "/icons";
53 const string ALBUM_MISSING_ICON_PATH = UNITY_ICON_PATH + "/album_missing.png";
54 const string ALBUM_MISSING_PREVIEW_ICON_PATH = UNITY_ICON_PATH + "/album_missing_preview.png";
55

Subscribers

People subscribed via source and target branches