aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--src/volume-control.vala3
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);
}