Merge lp:~morphis/indicator-bluetooth/fix-lp1530807 into lp:indicator-bluetooth/15.10

[Simon Fels]

Try to power on bluetooth through bluez if rfkill is already unblocked

In situations where we have to active bluetooth and the rfkill is already unblocked we need to go straight and set the 'Powered' property of the BlueZ adapter to true. The code now checks if the rfkill already has the state it should be in and if yes just switches the 'Powered' property.

[Konrad Zapałowicz (kzapalowicz)]

It is good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-wily-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-wily-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-wily-armhf-ci/4/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

LGTM.

review: Approve

Unmerged revisions

99. By Simon Fels on 2016-03-11

Remove changelog entry to be ready for landing

98. By Simon Fels on 2016-03-09

Fix version

97. By Simon Fels on 2016-03-09

Correctly check if killswitch already has the requested state and if yes
directly request BlueZ to switch the controller power state.

96. By Simon Fels on 2016-03-09

Check killswitch state before setting it

=== modified file 'src/bluez.vala'
--- src/bluez.vala	2016-02-14 21:05:19 +0000
+++ src/bluez.vala	2016-03-24 11:12:29 +0000
@@ -437,7 +437,10 @@
 
   public void try_set_enabled (bool b)
   {
-    if (killswitch != null)
+    // If either the killswitch is already in the state we request it
+    // here to switch to or we don't have a killswitch at all we
+    // directly switch to setting the powered property for BlueZ.
+    if (killswitch != null && killswitch.blocked == b)
       {
         debug (@"setting killswitch blocked to $(!b)");
         killswitch.try_set_blocked (!b);