ubuntu-system-settings

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

  1. lp1362517
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 1065
Merged at revision: 1070
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/lp1362517
Merge into: lp:ubuntu-system-settings
Diff against target: 39 lines (+6/-3)
1 file modified
plugins/bluetooth/PageComponent.qml (+6/-3)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/lp1362517
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Sebastien Bacher (community) Approve
Review via email: mp+235707@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
222 left: parent.left222 left: parent.left
223 right: parent.right223 right: parent.right
224 }224 }
225 visible: bluetoothActionGroup.enabled && (count > 0)225 visible: bluetoothActionGroup.enabled && (connectedRepeater.count > 0)
226226
227 Repeater {227 Repeater {
228 id: connectedRepeater
228 model: backend.connectedDevices229 model: backend.connectedDevices
229 delegate: ListItem.Standard {230 delegate: ListItem.Standard {
230 iconSource: iconPath231 iconSource: iconPath
@@ -261,9 +262,10 @@
261 left: parent.left262 left: parent.left
262 right: parent.right263 right: parent.right
263 }264 }
264 visible: bluetoothActionGroup.enabled && (count > 0)265 visible: bluetoothActionGroup.enabled && (disconnectedRepeater.count > 0)
265266
266 Repeater {267 Repeater {
268 id: disconnectedRepeater
267 model: backend.disconnectedDevices269 model: backend.disconnectedDevices
268 delegate: ListItem.Standard {270 delegate: ListItem.Standard {
269 iconSource: iconPath271 iconSource: iconPath
@@ -299,9 +301,10 @@
299 right: parent.right301 right: parent.right
300 }302 }
301303
302 visible: bluetoothActionGroup.enabled && (count > 0)304 visible: bluetoothActionGroup.enabled && (autoconnectRepeater.count > 0)
303305
304 Repeater {306 Repeater {
307 id: autoconnectRepeater
305 model: backend.autoconnectDevices308 model: backend.autoconnectDevices
306 delegate: ListItem.Standard {309 delegate: ListItem.Standard {
307 iconSource: iconPath310 iconSource: iconPath

Subscribers

People subscribed via source and target branches