Merge lp:~ted/indicator-sound/deduplicate-with-reason into lp:indicator-sound/15.04

[Ted Gould]

Always record the volume whether we do something with it or not (LP: #1446703)

Make sure we always store the updated reason so we don't get notifications for extra events.

[Ricardo Salveti (rsalveti)]

Looks good, fix a regression introduced by my previous change (my bad).

review: Approve

[Ted Gould (ted)]

Putting back to Needs Approval so that Jenkins will build a package.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:493
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/223/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/50/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

Switching back to Approved now that we have a deb that people can test with.

=== modified file 'src/volume-control-pulse.vala'
--- src/volume-control-pulse.vala	2015-04-13 06:02:29 +0000
+++ src/volume-control-pulse.vala	2015-04-17 17:12:09 +0000
@@ -616,25 +616,27 @@
 			return _volume;
 		}
 		set {
-			if (value.volume != _volume.volume) {
-				debug("Setting volume to %f for profile %d because %d", value.volume, _active_sink_input, value.reason);
-
-				var old_high_volume = this.high_volume;
-				_volume = value;
-
-				/* Make sure we're connected to Pulse and pulse didn't give us the change */
-				if (context.get_state () == Context.State.READY &&
-						_volume.reason != VolumeControl.VolumeReasons.PULSE_CHANGE)
-					if (_pulse_use_stream_restore)
-						set_volume_active_role.begin ();
-					else
-						context.get_server_info (server_info_cb_for_set_volume);
-
-				if (this.high_volume != old_high_volume)
-					this.notify_property("high-volume");
-
-				if (volume.reason != VolumeControl.VolumeReasons.ACCOUNTS_SERVICE_SET)
-					start_local_volume_timer();
+			var volume_changed = (value.volume != _volume.volume);
+			debug("Setting volume to %f for profile %d because %d", value.volume, _active_sink_input, value.reason);
+
+			var old_high_volume = this.high_volume;
+			_volume = value;
+
+			/* Make sure we're connected to Pulse and pulse didn't give us the change */
+			if (context.get_state () == Context.State.READY &&
+					_volume.reason != VolumeControl.VolumeReasons.PULSE_CHANGE &&
+					volume_changed)
+				if (_pulse_use_stream_restore)
+					set_volume_active_role.begin ();
+				else
+					context.get_server_info (server_info_cb_for_set_volume);
+
+			if (this.high_volume != old_high_volume)
+				this.notify_property("high-volume");
+
+			if (volume.reason != VolumeControl.VolumeReasons.ACCOUNTS_SERVICE_SET
+				&& volume_changed) {
+				start_local_volume_timer();
 			}
 		}
 	}