Merge lp:~ken-vandine/ubuntu-system-settings/rtm-1382767 into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

[bluetooth] Show bluetooth address instead of name while it's not detected; to be updated once available.

[bluetooth] Show bluetooth address instead of name while it's not detected; to be updated once available.

[Sebastien Bacher (seb128)]

Thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:940
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/36/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/15
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17232

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

review: Approve (continuous-integration)

=== modified file 'plugins/bluetooth/PageComponent.qml'
--- plugins/bluetooth/PageComponent.qml	2014-11-12 16:28:12 +0000
+++ plugins/bluetooth/PageComponent.qml	2014-11-18 19:38:22 +0000
@@ -317,7 +317,11 @@
 
     Page {
         id: connectedDevicePage
-        title: backend.selectedDevice ? backend.selectedDevice.name : i18n.tr("None")
+        title: backend.selectedDevice ?
+                  backend.selectedDevice.name.length > 0 ?
+                     backend.selectedDevice.name :
+                     backend.selectedDevice.address
+                  : i18n.tr("None")
         visible: false
 
         Flickable {
@@ -338,7 +342,10 @@
 
                 ListItem.SingleValue {
                     text: i18n.tr("Name")
-                    value: backend.selectedDevice ? backend.selectedDevice.name : i18n.tr("None")
+                    value: backend.selectedDevice &&
+                           backend.selectedDevice.name.length > 0 ?
+                                 backend.selectedDevice.name :
+                                 i18n.tr("None")
                 }
                 ListItem.Standard {
                     Rectangle {

=== modified file 'plugins/bluetooth/devicemodel.cpp'
--- plugins/bluetooth/devicemodel.cpp	2014-09-16 19:41:44 +0000
+++ plugins/bluetooth/devicemodel.cpp	2014-11-18 19:38:22 +0000
@@ -382,6 +382,8 @@
         if (device->isValid()) {
             addDevice(device);
         }
+    } else {
+        device->setProperties(properties);
     }
 }