Merge lp:~charlesk/ubuntu-system-settings/lp-1233628 into lp:ubuntu-system-settings

[Charles Kerr]

In the battery plugin, use indicator-bluetooth's "bluetooth-supported" action state to know whether or not to show the bluetooth toggle

In the battery plugin, use indicator-bluetooth's "bluetooth-supported" action state to know whether or not to show the bluetooth toggle

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:446
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~charlesk/ubuntu-system-settings/lp-1233628/+merge/190468/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/465/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/465

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/465/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks Charles, I guess that action is new and that we should update the indicator-bluetooth depends to the version containing it then?

[lp:~charlesk/ubuntu-system-settings/lp-1233628]

447. By Charles Kerr on 2013-10-10

add an indicator-bluetooth dependency rule to debian/control

448. By Charles Kerr on 2013-10-10

use >> instad of >

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:448
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/466/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/466

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/466/rebuild

review: Approve (continuous-integration)

[lp:~charlesk/ubuntu-system-settings/lp-1233628]

449. By Charles Kerr on 2013-10-10

if at first you don't succeed...

[Sebastien Bacher (seb128)]

thanks, I'm comment approving but I'm going to wait on the indicator update to land to change the status, we don't want to block settings to be uploaded on indicators (settings are in universe and likely to land before indicators)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:449
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/467/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/467

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/467/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Ok, the indicator update landed in saucy, the fix works as advertised on both desktop and touch, thanks!

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-10-01 10:22:58 +0000
+++ debian/control	2013-10-10 20:51:35 +0000
@@ -34,6 +34,7 @@
          bluez (>= 4.36),
          gsettings-desktop-schemas,
          gsettings-ubuntu-touch-schemas (>= 0.0.1+13.10.20130730),
+         indicator-bluetooth (>> 0.0.6+13.10.20131010),
          indicator-network (>= 0.5.0+13.10.20130918),
          powerd | gnome-settings-daemon,
          qmenumodel-qml,
 
=== modified file 'plugins/battery/PageComponent.qml'
--- plugins/battery/PageComponent.qml	2013-10-08 15:18:30 +0000
+++ plugins/battery/PageComponent.qml	2013-10-10 20:51:35 +0000
@@ -293,12 +293,8 @@
                 busName: "com.canonical.indicator.bluetooth"
                 objectPath: "/com/canonical/indicator/bluetooth"
 
+                property bool visible: action("bluetooth-supported")
                 property variant enabled: action("bluetooth-enabled")
-                property variant actionVisible: action("root-phone")
-
-                property bool visible:
-                    actionVisible.state.visible === undefined ||
-                    actionVisible.state.visible
 
                 Component.onCompleted: start()
             }