ubuntu-system-settings

Merge lp:~ken-vandine/ubuntu-system-settings/address-not-name-rtm-logic-error into lp:ubuntu-system-settings

  1. address-not-name-rtm-logic-error
  2. Merge into trunk
Proposed by Ken VanDine on 2015-02-18
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2015-02-18
Approved revision: 1316
Merged at revision: 1318
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/address-not-name-rtm-logic-error
Merge into: lp:ubuntu-system-settings
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/bluetooth/devicemodel.cpp (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/address-not-name-rtm-logic-error
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2015-02-18 Approve on 2015-02-18
Review via email: mp+250152@code.launchpad.net

Commit Message

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

Description of the Change

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

To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

Totally!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/bluetooth/devicemodel.cpp'
2--- plugins/bluetooth/devicemodel.cpp 2015-02-06 16:48:49 +0000
3+++ plugins/bluetooth/devicemodel.cpp 2015-02-18 15:16:04 +0000
4@@ -546,7 +546,7 @@
5 if (displayName.isEmpty())
6 displayName = device->getAddress();
7
8- if (device->isPaired())
9+ if (!device->isPaired())
10 displayName.append("…");
11
12 ret = displayName;

Subscribers

People subscribed via source and target branches