The Sound Menu

Merge lp:~charlesk/indicator-sound/lp-1229612-13.10 into lp:indicator-sound/13.10

  1. lp-1229612-13.10
  2. Merge into trunk.13.10
Proposed by Charles Kerr
Status: Merged
Approved by: Lars Karlitski
Approved revision: 391
Merged at revision: 392
Proposed branch: lp:~charlesk/indicator-sound/lp-1229612-13.10
Merge into: lp:indicator-sound/13.10
Diff against target: 16 lines (+5/-1)
1 file modified
src/sound-menu.vala (+5/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-sound/lp-1229612-13.10
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Lars Karlitski (community) Approve
Review via email: mp+192976@code.launchpad.net

Description of the change

backport the media-player-icon-nullptr bugfix from trunk.

To post a comment you must log in.
Revision history for this message
Lars Karlitski (larsu) wrote :

Thanks.

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

PASSED: Continuous integration, rev:391
http://jenkins.qa.ubuntu.com/job/indicator-sound-13.10-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-13.10-saucy-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-13.10-saucy-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-13.10-saucy-armhf-ci/7/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-sound-13.10-ci/7/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 'src/sound-menu.vala'
2--- src/sound-menu.vala 2013-10-10 03:32:49 +0000
3+++ src/sound-menu.vala 2013-10-29 00:07:52 +0000
4@@ -84,7 +84,11 @@
5 /* Add new players to the end of the player sections, just before the settings */
6 var player_item = new MenuItem (player.name, "indicator." + player.id);
7 player_item.set_attribute ("x-canonical-type", "s", "com.canonical.unity.media-player");
8- player_item.set_attribute_value ("icon", g_icon_serialize (player.icon));
9+ var icon = player.icon;
10+ if (icon == null)
11+ icon = new ThemedIcon.with_default_fallbacks ("application-default-icon");
12+ if (icon != null)
13+ player_item.set_attribute_value ("icon", g_icon_serialize (icon));
14
15 var playback_item = new MenuItem (null, null);
16 playback_item.set_attribute ("x-canonical-type", "s", "com.canonical.unity.playback-item");

Subscribers

People subscribed via source and target branches