From 8f282fe14fb183e7a6e3b7de4b2ed81fd612b68c Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Tue, 3 Nov 2020 10:51:38 -0500
Subject: [PATCH] newaccountmodel: remove "ring:" prefix introduced by prepend
function
Gitlab: #446
Change-Id: If2b685e1c8ed26d564ac0604f4d5b9575499db11
---
src/newaccountmodel.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/newaccountmodel.cpp b/src/newaccountmodel.cpp
index 9a011a90..64b6bf6b 100644
--- a/src/newaccountmodel.cpp
+++ b/src/newaccountmodel.cpp
@@ -239,8 +239,7 @@ NewAccountModel::setAccountConfig(const QString& accountId,
? QString(ProtocolNames::RING)
: QString(ProtocolNames::SIP);
if (accountInfo.profileInfo.type == profile::Type::RING) {
- details[ConfProperties::USERNAME] = accountInfo.profileInfo.uri.prepend(
- (accountInfo.profileInfo.type == profile::Type::RING) ? "ring:" : "");
+ details[ConfProperties::USERNAME] = accountInfo.profileInfo.uri;
} else if (accountInfo.profileInfo.type == profile::Type::SIP) {
VectorMapStringString finalCred;
@@ -735,7 +734,9 @@ NewAccountModelPimpl::addToAccounts(const QString& accountId, std::shared_ptr<Da
// Init models for this account
newAccInfo.accountModel = &linked;
- newAccInfo.callModel = std::make_unique<NewCallModel>(newAccInfo, callbacksHandler, behaviorController);
+ newAccInfo.callModel = std::make_unique<NewCallModel>(newAccInfo,
+ callbacksHandler,
+ behaviorController);
newAccInfo.contactModel = std::make_unique<ContactModel>(newAccInfo,
*db,
callbacksHandler,
--
GitLab