Merge lp:~charlesk/indicator-sound/lp-1244468 into lp:indicator-sound/14.04

[Charles Kerr]

In Service's volume_changed() function, explicitly instantiate the GVariant to avoid leaking it. See the description in bug #1244468 for before & after C code and more information.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:395
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-sound-ci/64/rebuild

review: Approve (continuous-integration)

[lp:~charlesk/indicator-sound/lp-1244468]

396. By Charles Kerr on 2013-10-25

fix similar variant leaks

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:396
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/65/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-sound-ci/65/rebuild

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Workaroundy, but looks fine to me. Nice find!

review: Approve

=== modified file 'src/service.vala'
--- src/service.vala	2013-10-24 19:48:08 +0000
+++ src/service.vala	2013-10-25 00:24:36 +0000
@@ -175,10 +175,10 @@
 	}
 
 	Action create_mute_action () {
-		var mute_action = new SimpleAction.stateful ("mute", null, this.volume_control.mute);
+		var mute_action = new SimpleAction.stateful ("mute", null, new Variant.boolean (this.volume_control.mute));
 
 		mute_action.activate.connect ( (action, param) => {
-			action.change_state (!action.get_state ().get_boolean ());
+			action.change_state (new Variant.boolean (!action.get_state ().get_boolean ()));
 		});
 
 		mute_action.change_state.connect ( (action, val) => {
@@ -186,7 +186,7 @@
 		});
 
 		this.volume_control.notify["mute"].connect ( () => {
-			mute_action.set_state (this.volume_control.mute);
+			mute_action.set_state (new Variant.boolean (this.volume_control.mute));
 			this.update_root_icon ();
 		});
 
@@ -195,13 +195,13 @@
 
 	void volume_changed (double volume) {
 		var volume_action = this.actions.lookup_action ("volume") as SimpleAction;
-		volume_action.set_state (volume);
+		volume_action.set_state (new Variant.double (volume));
 
 		this.update_root_icon ();
 	}
 
 	Action create_volume_action () {
-		var volume_action = new SimpleAction.stateful ("volume", VariantType.INT32, this.volume_control.get_volume ());
+		var volume_action = new SimpleAction.stateful ("volume", VariantType.INT32, new Variant.double (this.volume_control.get_volume ()));
 
 		volume_action.change_state.connect ( (action, val) => {
 			volume_control.set_volume (val.get_double ());
@@ -221,14 +221,14 @@
 	}
 
 	Action create_mic_volume_action () {
-		var volume_action = new SimpleAction.stateful ("mic-volume", null, this.volume_control.get_mic_volume ());
+		var volume_action = new SimpleAction.stateful ("mic-volume", null, new Variant.double (this.volume_control.get_mic_volume ()));
 
 		volume_action.change_state.connect ( (action, val) => {
 			volume_control.set_mic_volume (val.get_double ());
 		});
 
 		this.volume_control.mic_volume_changed.connect ( (volume) => {
-			volume_action.set_state (volume);
+			volume_action.set_state (new Variant.double (volume));
 		});
 
 		this.volume_control.bind_property ("ready", volume_action, "enabled", BindingFlags.SYNC_CREATE);