Merge lp:~laney/unity-lens-music/notify-notification into lp:unity-lens-music

Proposed by Iain Lane
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 150
Merged at revision: 150
Proposed branch: lp:~laney/unity-lens-music/notify-notification
Merge into: lp:unity-lens-music
Diff against target: 21 lines (+2/-2)
1 file modified
src/musicstore-scope.vala (+2/-2)
To merge this branch: bzr merge lp:~laney/unity-lens-music/notify-notification
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+235434@code.launchpad.net

Commit message

Qualify Notify to Notify.Notification to fix FTBFS due to ambiguity

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:150
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~laney/unity-lens-music/notify-notification/+merge/235434/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-lens-music-ci/22/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-music-utopic-amd64-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-utopic-armhf-ci/4
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-music-utopic-i386-ci/4/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

looks fine, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/musicstore-scope.vala'
2--- src/musicstore-scope.vala 2013-06-20 13:23:37 +0000
3+++ src/musicstore-scope.vala 2014-09-22 10:13:32 +0000
4@@ -37,7 +37,7 @@
5 private PreferencesManager preferences = PreferencesManager.get_default ();
6 private HashTable<string, Album> album_map;
7 private PurchaseService purchase_service;
8- private Notification notification;
9+ private Notify.Notification notification;
10
11 public MusicStoreScopeProxy ()
12 {
13@@ -54,7 +54,7 @@
14 base.initialize ();
15
16 Notify.init ("Music Store Scope");
17- notification = new Notification("Album name", _("Purchase started"), "");
18+ notification = new Notify.Notification("Album name", _("Purchase started"), "");
19 collection = new MusicStoreCollection ();
20 album_map = new HashTable<string, Album>(str_hash, str_equal);
21 purchase_service = new PurchaseService ();

Subscribers

People subscribed via source and target branches

to all changes: