Merge lp:~xavi-garcia-mena/indicator-sound/icon-volume-zero into lp:indicator-sound/15.10

Proposed by Xavi Garcia
Status: Merged
Approved by: Charles Kerr
Approved revision: 501
Merged at revision: 503
Proposed branch: lp:~xavi-garcia-mena/indicator-sound/icon-volume-zero
Merge into: lp:indicator-sound/15.10
Diff against target: 26 lines (+2/-4)
1 file modified
src/service.vala (+2/-4)
To merge this branch: bzr merge lp:~xavi-garcia-mena/indicator-sound/icon-volume-zero
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+267787@code.launchpad.net

Commit message

Changing the icon in the indicator when volume is 0 to match the OSD popup.

Description of the change

Changing the icon in the indicator when volume is 0 to match the OSD popup.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/service.vala'
2--- src/service.vala 2015-08-07 22:34:16 +0000
3+++ src/service.vala 2015-08-12 09:59:20 +0000
4@@ -133,7 +133,7 @@
5 private void show_notification(Notify.Notification? n) {
6 if (n != null) {
7 try {
8- n.show ();
9+ n.show ();
10 } catch (GLib.Error e) {
11 warning ("Unable to show notification: %s", e.message);
12 }
13@@ -275,12 +275,10 @@
14 void update_root_icon () {
15 double volume = this.volume_control.volume.volume;
16 string icon;
17- if (this.volume_control.mute)
18+ if (this.volume_control.mute || volume <= 0.0)
19 icon = this.mute_blocks_sound ? "audio-volume-muted-blocking-panel" : "audio-volume-muted-panel";
20 else if (this.accounts_service != null && this.accounts_service.silentMode)
21 icon = "audio-volume-muted-panel";
22- else if (volume <= 0.0)
23- icon = "audio-volume-low-zero-panel";
24 else if (volume <= 0.3)
25 icon = "audio-volume-low-panel";
26 else if (volume <= 0.7)

Subscribers

People subscribed via source and target branches