diff options
| author | Ted Gould <ted@gould.cx> | 2014-10-14 18:31:20 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2014-10-14 18:31:20 -0500 |
| commit | df076876ee9adc237818a3a11fa4010b945f0987 (patch) | |
| tree | a165f6f87cd8edb50dc4822dec6d25771ea45551 | |
| parent | 297a640e325c129a6ecd42210db30e522465078b (diff) | |
| parent | d7fbfc4d0babbcd54a3951f5da721153cc194d9b (diff) | |
| download | ayatana-indicator-sound-df076876ee9adc237818a3a11fa4010b945f0987.tar.gz ayatana-indicator-sound-df076876ee9adc237818a3a11fa4010b945f0987.tar.bz2 ayatana-indicator-sound-df076876ee9adc237818a3a11fa4010b945f0987.zip | |
Grabbing updates to the extreme volume branch
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | src/volume-control.vala | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 1e47f23..e9e29d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-sound (12.10.2+14.10.20141010-0ubuntu1) utopic; urgency=low + + [ Ricardo Salveti de Araujo ] + * volume-control: making sure we're always in sync with accountservice + (LP: #1379618) + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 10 Oct 2014 15:40:30 +0000 + indicator-sound (12.10.2+14.10.20141008-0ubuntu1) utopic; urgency=low [ Ted Gould ] diff --git a/src/volume-control.vala b/src/volume-control.vala index 8e92f90..bdfe5bf 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -199,6 +199,7 @@ public class VolumeControl : Object { _volume = volume_to_double (i.volume.max ()); volume_changed (_volume); + start_local_volume_timer(); } else if (this._active_port_headphone != old_active_port_headphone) { volume_changed (_volume); } @@ -269,6 +270,7 @@ public class VolumeControl : Object /* Someone else changed the volume for this role, reflect on the indicator */ _volume = volume_to_double (volume); volume_changed (_volume); + start_local_volume_timer(); } } } @@ -311,6 +313,7 @@ public class VolumeControl : Object _volume = volume_to_double (volume); volume_changed (_volume); + start_local_volume_timer(); } catch (GLib.Error e) { warning ("unable to get volume for active role %s (%s)", sink_input_objp, e.message); } @@ -608,7 +611,7 @@ public class VolumeControl : Object high_volume = false; /* Determine Label */ - string volume_label = _("Volume"); + string volume_label = ""; if (high_volume) volume_label = _("High volume"); @@ -632,10 +635,13 @@ public class VolumeControl : Object tint = "true"; /* Put it all into the notification */ + _notification.clear_hints (); _notification.update (_("Volume"), volume_label, icon); _notification.set_hint ("value", (int32)(volume * 100.0)); _notification.set_hint ("sound-file", sound); _notification.set_hint ("x-canonical-value-bar-tint", tint); + _notification.set_hint ("x-canonical-private-synchronous", "true"); + _notification.set_hint ("x-canonical-non-shaped-icon", "true"); /* Show it */ try { |