Merge lp:~cyphermox/ubuntu-system-settings/lp1382767 into lp:ubuntu-system-settings

[Mathieu Trudel-Lapierre]

[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.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1143
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/~mathieu-tl/ubuntu-system-settings/lp1382767/+merge/239066/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1668/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4158
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/860
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5731
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7355
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7355/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14911
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4503
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4503/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

looks fine to me, thanks

review: Approve

=== modified file 'plugins/bluetooth/PageComponent.qml'
--- plugins/bluetooth/PageComponent.qml	2014-09-23 19:32:29 +0000
+++ plugins/bluetooth/PageComponent.qml	2014-10-21 14:20:22 +0000
@@ -323,7 +323,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 {
@@ -344,7 +348,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-10-21 14:20:22 +0000
@@ -382,6 +382,8 @@
         if (device->isValid()) {
             addDevice(device);
         }
+    } else {
+        device->setProperties(properties);
     }
 }