Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Goetz <markus@woboq.com>2015-08-11 13:18:25 +0300
committerMarkus Goetz <markus@woboq.com>2015-08-11 13:18:25 +0300
commitbd71fdc388d2daf0e241d55745858c4ea677debe (patch)
treee3da7d6de65de47ae1d9495daa8d88658413aa85 /src/gui/sslbutton.cpp
parent6110a99afc0f3e9e2eeda5dcd04afcf110084201 (diff)
SslButton: Fix harder #3534 #3536
Diffstat (limited to 'src/gui/sslbutton.cpp')
-rw-r--r--src/gui/sslbutton.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/sslbutton.cpp b/src/gui/sslbutton.cpp
index 640b5dc21..9c5bad0b1 100644
--- a/src/gui/sslbutton.cpp
+++ b/src/gui/sslbutton.cpp
@@ -188,7 +188,7 @@ void SslButton::updateAccountState(AccountState *accountState)
if (account->url().scheme() == QLatin1String("https")) {
QPixmap pm(Theme::hidpiFileName(":/client/resources/lock-https.png"));
setIcon(QIcon(pm));
- QSslCipher cipher = account->sslConfiguration().sessionCipher();
+ QSslCipher cipher = account->_sessionCipher;
setToolTip(tr("This connection is encrypted using %1 bit %2.\n").arg(cipher.usedBits()).arg(cipher.name()));
setMenu(_menu);
} else {
@@ -208,19 +208,19 @@ void SslButton::slotUpdateMenu() {
AccountPtr account = _accountState->account();
if (account->url().scheme() == QLatin1String("https")) {
- QString sslVersion = account->sslConfiguration().sessionCipher().protocolString()
- + ", " + account->sslConfiguration().sessionCipher().authenticationMethod()
- + ", " + account->sslConfiguration().sessionCipher().keyExchangeMethod()
- + ", " + account->sslConfiguration().sessionCipher().encryptionMethod();
+ QString sslVersion = account->_sessionCipher.protocolString()
+ + ", " + account->_sessionCipher.authenticationMethod()
+ + ", " + account->_sessionCipher.keyExchangeMethod()
+ + ", " + account->_sessionCipher.encryptionMethod();
_menu->addAction(sslVersion)->setEnabled(false);
#if QT_VERSION > QT_VERSION_CHECK(5, 2, 0)
- if (account->sslConfiguration().sessionTicket().isEmpty()) {
+ if (account->_sessionTicket.isEmpty()) {
_menu->addAction(tr("No support for SSL session tickets/identifiers"))->setEnabled(false);
}
#endif
- QList<QSslCertificate> chain = account->sslConfiguration().peerCertificateChain();
+ QList<QSslCertificate> chain = account->_peerCertificateChain;
if (chain.isEmpty()) {
qWarning() << "empty certificate chain";