diff options
| author | Ted Gould <ted@gould.cx> | 2014-10-14 16:27:08 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2014-10-14 16:27:08 -0500 |
| commit | bca300c56a2d77c4a51b96d3c35c9b2d20ceb0a3 (patch) | |
| tree | 175d5aedf8774c287e1fe9d9c5941938d8469b94 | |
| parent | a3de59a992980727e05c58e052be53a8adc5bf08 (diff) | |
| parent | dec2d5350f47e52539941b45d394516066a19678 (diff) | |
| download | ayatana-indicator-sound-bca300c56a2d77c4a51b96d3c35c9b2d20ceb0a3.tar.gz ayatana-indicator-sound-bca300c56a2d77c4a51b96d3c35c9b2d20ceb0a3.tar.bz2 ayatana-indicator-sound-bca300c56a2d77c4a51b96d3c35c9b2d20ceb0a3.zip | |
Merge trunk
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | src/volume-control.vala | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index d635780..483c78b 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.20141009-0ubuntu1) utopic; urgency=low [ Ted Gould ] diff --git a/src/volume-control.vala b/src/volume-control.vala index cf2dacf..8245c50 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); } |