From 4f0b02c60d485f6fb7a457b68b92d000344e2faa Mon Sep 17 00:00:00 2001 From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com> Date: Fri, 14 Aug 2015 11:40:58 -0400 Subject: [PATCH] settings: adapt to LRC API change - Change to API private key Issue: #78968 Change-Id: Ifd828ce3a06a7132f838417ef77513871db01099 --- accountdetails.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/accountdetails.cpp b/accountdetails.cpp index 78a2532..a853fb8 100644 --- a/accountdetails.cpp +++ b/accountdetails.cpp @@ -193,16 +193,16 @@ AccountDetails::setAccount(Account* currentAccount) { ui->tlsProtocoCombo->setModel(currentAccount_->tlsMethodModel()); if (currentAccount_->tlsCaListCertificate()) - ui->lrcfg_tlsCaListCertificate->setText(currentAccount_->tlsCaListCertificate()->path().fileName()); + ui->lrcfg_tlsCaListCertificate->setText(currentAccount_->tlsCaListCertificate()->path()); if (currentAccount_->tlsCertificate()) - ui->lrcfg_tlsCertificate->setText(currentAccount_->tlsCertificate()->path().fileName()); - if (currentAccount_->tlsPrivateKeyCertificate()) - ui->lrcfg_tlsPrivateKeyCertificate->setText(currentAccount_->tlsPrivateKeyCertificate()->path().fileName()); + ui->lrcfg_tlsCertificate->setText(currentAccount_->tlsCertificate()->path()); + if (not currentAccount_->tlsPrivateKey().isEmpty()) + ui->lrcfg_tlsPrivateKeyCertificate->setText(currentAccount_->tlsPrivateKey()); #ifdef Q_OS_WIN32 certMap_[ui->lrcfg_tlsCaListCertificate->objectName()] = ¤tAccount_->setTlsCaListCertificate; certMap_[ui->lrcfg_tlsCertificate->objectName()] = ¤tAccount_->setTlsCertificate; - certMap_[ui->lrcfg_tlsPrivateKeyCertificate->objectName()] = ¤tAccount_->setTlsPrivateKeyCertificate; + certMap_[ui->lrcfg_tlsPrivateKeyCertificate->objectName()] = ¤tAccount_->setTlsPrivateKey; #endif ui->srtpEnabled->disconnect(); -- GitLab