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

[Charles Kerr]

Test that MediaPlayer's icon property isn't NULL before we serialize it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:396
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/66/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-sound-ci/66/rebuild

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Ah, thanks.

I think we should show "application-default-icon" when the application doesn't provide an icon through its desktop file. It's the icon that unity seems to be using in the dash as well.

review: Needs Fixing

[lp:~charlesk/indicator-sound/lp-1229612]

397. By Charles Kerr on 2013-10-28

use 'application-default-icon' as the fallback media player icon

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:397
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/8/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-sound-ci/69/rebuild

review: Approve (continuous-integration)

[lp:~charlesk/indicator-sound/lp-1229612]

398. By Charles Kerr on 2013-10-28

add the null safeguard back for the pathological case of 'application-default-icon' also failing

[Lars Karlitski (larsu)]

Thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:398
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/70/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/9/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-sound-ci/70/rebuild

review: Approve (continuous-integration)

=== modified file 'src/sound-menu.vala'
--- src/sound-menu.vala	2013-10-24 19:33:47 +0000
+++ src/sound-menu.vala	2013-10-28 19:08:50 +0000
@@ -141,10 +141,16 @@
 
 	void insert_player_section (MediaPlayer player) {
 		var section = new Menu ();
+		Icon icon;
+
+		icon = player.icon;
+		if (icon == null)
+			icon = new ThemedIcon.with_default_fallbacks ("application-default-icon");
 
 		var player_item = new MenuItem (player.name, "indicator." + player.id);
 		player_item.set_attribute ("x-canonical-type", "s", "com.canonical.unity.media-player");
-		player_item.set_attribute_value ("icon", g_icon_serialize (player.icon));
+		if (icon != null)
+			player_item.set_attribute_value ("icon", g_icon_serialize (icon));
 		section.append_item (player_item);
 
 		var playback_item = new MenuItem (null, null);