Merge lp:~cyphermox/ubuntu-system-settings/address-not-name-rtm into lp:ubuntu-system-settings/rtm-14.09

[Mathieu Trudel-Lapierre]

Use the address instead of name in main device list if name isn't available.

Use the address instead of name in main device list if name isn't available.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:989
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/62/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/63
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/63/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/41
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18098

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Thanks

review: Approve

[lp:~cyphermox/ubuntu-system-settings/address-not-name-rtm]

990. By Mathieu Trudel-Lapierre on 2015-02-18

Fix logic error in check for Paired to know if we should add ellipsis.

=== modified file 'plugins/bluetooth/devicemodel.cpp'
--- plugins/bluetooth/devicemodel.cpp	2014-11-18 19:37:24 +0000
+++ plugins/bluetooth/devicemodel.cpp	2015-02-18 15:10:35 +0000
@@ -537,10 +537,19 @@
     if ((0<=index.row()) && (index.row()<m_devices.size())) {
 
         auto device = m_devices[index.row()];
+        QString displayName;
 
         switch (role) {
         case Qt::DisplayRole:
-            ret = device->isPaired() ? device->getName() : device->getName() + "…";
+            displayName = device->getName();
+ 
+            if (displayName.isEmpty())
+                displayName = device->getAddress();
+
+            if (!device->isPaired())
+                displayName.append("…");
+
+            ret = displayName;
             break;
 
         case IconRole: