Merge lp:~ken-vandine/ubuntu-system-settings/lp1362517 into lp:ubuntu-system-settings

[Ken VanDine]

Fixed reference error for count on the various device models (LP: #1362517)

Fixed reference error for count on the various device models (LP: #1362517)

[Sebastien Bacher (seb128)]

thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1065
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1531/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5110/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3723
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/723
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4855/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6362
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6362/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13620
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4034
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4034/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1531/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1065
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1536/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3735
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/728
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4875
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6381
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6381/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13652
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4046
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4046/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1536/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/bluetooth/PageComponent.qml'
--- plugins/bluetooth/PageComponent.qml	2014-08-26 17:15:57 +0000
+++ plugins/bluetooth/PageComponent.qml	2014-09-23 19:34:04 +0000
@@ -222,9 +222,10 @@
                     left: parent.left
                     right: parent.right
                 }
-                visible: bluetoothActionGroup.enabled && (count > 0)
+                visible: bluetoothActionGroup.enabled && (connectedRepeater.count > 0)
 
                 Repeater {
+                    id: connectedRepeater
                     model: backend.connectedDevices
                     delegate: ListItem.Standard {
                         iconSource: iconPath
@@ -261,9 +262,10 @@
                     left: parent.left
                     right: parent.right
                 }
-                visible: bluetoothActionGroup.enabled && (count > 0)
+                visible: bluetoothActionGroup.enabled && (disconnectedRepeater.count > 0)
 
                 Repeater {
+                    id: disconnectedRepeater
                     model: backend.disconnectedDevices
                     delegate: ListItem.Standard {
                         iconSource: iconPath
@@ -299,9 +301,10 @@
                     right: parent.right
                 }
 
-                visible: bluetoothActionGroup.enabled && (count > 0)
+                visible: bluetoothActionGroup.enabled && (autoconnectRepeater.count > 0)
 
                 Repeater {
+                    id: autoconnectRepeater
                     model: backend.autoconnectDevices
                     delegate: ListItem.Standard {
                         iconSource: iconPath