From 44a3239eb52ad7928a041fa910da958ff41d9958 Mon Sep 17 00:00:00 2001
From: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
Date: Thu, 11 May 2017 11:40:19 -0400
Subject: [PATCH] Ring::Role::Number returns bestId instead of URI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Whenever possible, we should be displaying the registered name
instead of the RingID. We make the Ring::Role::Number data role
use getBestId() instead of uri(). The user can still explicitly
ask for the Uri if needed.
Change-Id: I9dda876bff9c6dbe293f40781c5c388b7ec1bb2a
Reviewed-by: Nicolas Jäger <nicolas.jager@savoirfairelinux.com>
---
src/call.cpp | 2 +-
src/contactmethod.cpp | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/call.cpp b/src/call.cpp
index 3f5bd606..e13752e3 100644
--- a/src/call.cpp
+++ b/src/call.cpp
@@ -2183,7 +2183,7 @@ QVariant Call::roleData(int role) const
return dialNumber();
case static_cast<int>(Ring::Role::Number):
case static_cast<int>(Call::Role::Number):
- return peerContactMethod()->uri();
+ return peerContactMethod()->getBestId();
case Qt::DecorationRole:
return GlobalInstances::pixmapManipulator().decorationRole(this);
case static_cast<int>(Call::Role::Direction):
diff --git a/src/contactmethod.cpp b/src/contactmethod.cpp
index c21c2ef5..96ff35e4 100644
--- a/src/contactmethod.cpp
+++ b/src/contactmethod.cpp
@@ -552,12 +552,14 @@ QVariant ContactMethod::roleData(int role) const
case Qt::ToolTipRole:
cat = presenceMessage();
break;
+ case static_cast<int>(Role::Uri):
+ cat = uri();
+ break;
case Qt::DisplayRole:
case Qt::EditRole:
- case static_cast<int>(Role::Uri):
case static_cast<int>(Ring::Role::Number):
case static_cast<int>(Call::Role::Number):
- cat = uri();
+ cat = getBestId();
break;
case Qt::DecorationRole:
return GlobalInstances::pixmapManipulator().decorationRole(this);
--
GitLab