Merge lp:~larsu/indicator-sound/rename-blocking-icon into lp:indicator-sound/14.04

[Lars Karlitski]

Use audio-volume-mute-blocking-panel instead of *-blocked-panel

Use audio-volume-mute-blocking-panel instead of *-blocked-panel

blocked is in Humanity and blocking is in ubuntu-mono. Simon fixed the icon in ubuntu-mono to be red instead of blue: lp:~ochosi/ubuntu-themes/audio-volume-blocking

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/116/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

that's better indeed (theme update landed in trusty today)

review: Approve

=== modified file 'src/service.vala'
--- src/service.vala	2014-03-18 10:00:51 +0000
+++ src/service.vala	2014-03-19 17:23:35 +0000
@@ -188,7 +188,7 @@
 		double volume = this.volume_control.get_volume ();
 		string icon;
 		if (this.volume_control.mute)
-			icon = this.mute_blocks_sound ? "audio-volume-muted-blocked-panel" : "audio-volume-muted-panel";
+			icon = this.mute_blocks_sound ? "audio-volume-muted-blocking-panel" : "audio-volume-muted-panel";
 		else if (volume <= 0.0)
 			icon = "audio-volume-low-zero-panel";
 		else if (volume <= 0.3)