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

[Charles Kerr]

explicitly instantiate GVariants to avoid leaking them. See the description in bug #1244468 for before & after C code and more information.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-bluetooth-ci/25/rebuild

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Workaroundy, but looks fine to me. Nice find!

review: Approve

=== modified file 'src/desktop.vala'
--- src/desktop.vala	2013-10-21 21:55:15 +0000
+++ src/desktop.vala	2013-10-25 00:20:38 +0000
@@ -104,10 +104,10 @@
         debug (@"creating action for $action_name");
         var a = new SimpleAction.stateful (action_name,
                                            null,
-                                           device.is_connected);
+                                           new Variant.boolean (device.is_connected));
 
         a.activate.connect (()
-          => a.set_state (!a.get_state().get_boolean()));
+          => a.set_state (new Variant.boolean (!a.get_state().get_boolean())));
 
         a.notify["state"].connect (()
           => bluetooth.set_device_connected (id, a.get_state().get_boolean()));
@@ -119,7 +119,7 @@
       {
         debug (@"updating action $(device.id) state to $(device.is_connected)");
         var action = connect_actions.lookup (device.id);
-        action.set_state (device.is_connected);
+        action.set_state (new Variant.boolean (device.is_connected));
       }
 
     return item;
@@ -218,16 +218,16 @@
   {
     var action = new SimpleAction.stateful ("desktop-discoverable",
                                             null,
-                                            bluetooth.discoverable);
+                                            new Variant.boolean (bluetooth.discoverable));
 
     action.activate.connect (()
-        => action.set_state (!action.get_state().get_boolean()));
+        => action.set_state (new Variant.boolean (!action.get_state().get_boolean())));
 
     action.notify["state"].connect (()
         => bluetooth.try_set_discoverable (action.get_state().get_boolean()));
 
     bluetooth.notify["discoverable"].connect (()
-        => action.set_state (bluetooth.discoverable));
+        => action.set_state (new Variant.boolean (bluetooth.discoverable)));
 
     return action;
   }

=== modified file 'src/profile.vala'
--- src/profile.vala	2013-10-11 13:38:51 +0000
+++ src/profile.vala	2013-10-25 00:20:38 +0000
@@ -111,10 +111,10 @@
   {
     var action = new SimpleAction.stateful ("bluetooth-supported",
                                             null,
-                                            bluetooth.supported);
+                                            new Variant.boolean (bluetooth.supported));
 
     bluetooth.notify["supported"].connect (()
-        => action.set_state (bluetooth.supported));
+        => action.set_state (new Variant.boolean (bluetooth.supported)));
 
     return action;
   }
@@ -123,16 +123,16 @@
   {
     var action = new SimpleAction.stateful ("bluetooth-enabled",
                                             null,
-                                            bluetooth.enabled);
+                                            new Variant.boolean (bluetooth.enabled));
 
     action.activate.connect (()
-        => action.change_state (!action.get_state().get_boolean()));
+        => action.change_state (new Variant.boolean (!action.get_state().get_boolean())));
 
     action.change_state.connect ((action, requestedValue)
         => bluetooth.try_set_enabled (requestedValue.get_boolean()));
 
     bluetooth.notify["enabled"].connect (()
-        => action.set_state (bluetooth.enabled));
+        => action.set_state (new Variant.boolean (bluetooth.enabled)));
 
     return action;
   }