Merge lp:~rsalveti/indicator-sound/making_sure_always_syncing_accountservice into lp:indicator-sound/14.10

[Ricardo Salveti]

volume-control: making sure we're always in sync with accountservice

volume-control: making sure we're always in sync with accountservice

Syncing volume in the following situations:
1 - volume changed as a consequence of a sink add/remove event;
2 - changed role on touch;
3 - external entity setting up the volume for the active role on touch;

[lp:~rsalveti/indicator-sound/making_sure_always_syncing_accountservice]

457. By Ricardo Salveti on 2014-10-10

volume-control: making sure we're always in sync with accountservice

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:457
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/157/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-utopic-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-utopic-armhf-ci/24/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'src/volume-control.vala'
--- src/volume-control.vala	2014-10-08 18:17:29 +0000
+++ src/volume-control.vala	2014-10-10 03:55:22 +0000
@@ -170,6 +170,7 @@
 		{
 			_volume = volume_to_double (i.volume.max ());
 			volume_changed (_volume);
+			start_local_volume_timer();
 		}
 	}
 
@@ -238,6 +239,7 @@
 						/* Someone else changed the volume for this role, reflect on the indicator */
 						_volume = volume_to_double (volume);
 						volume_changed (_volume);
+						start_local_volume_timer();
 					}
 				}
 			}
@@ -280,6 +282,7 @@
 
 				_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);
 			}