diff options
| author |  Szymon Tomasz Stefanek | 2008-08-28 23:59:15 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2008-08-28 23:59:15 +0000 |
| commit | 394060bd4aa68b0d95718599314edce9876932e7 (patch) | |
| tree | cfa48e4312ef33888cd8b90df617390153e41be2 /src/modules | |
| parent | Hack KviIrcSocket in order to allow entering SSL mode after the STARTTLS ackn... (diff) | |
| download | KVIrc-394060bd4aa68b0d95718599314edce9876932e7.tar.gz KVIrc-394060bd4aa68b0d95718599314edce9876932e7.tar.bz2 KVIrc-394060bd4aa68b0d95718599314edce9876932e7.zip | |
Low level support for STARTTLS. Needs polishing, though.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2343 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/options/optw_servers.cpp | 14 | ||||
| -rw-r--r-- | src/modules/options/optw_servers.h | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 2183d544a..d20a9ffac 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -630,14 +630,14 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviServer * s) #endif m_pUseSSLCheck->setChecked(s->useSSL()); - m_pUseSTARTTLSCheck = new QCheckBox(__tr2qs_ctx("Use STARTTLS protocol","options"),tab); - gl->addWidget(m_pUseSTARTTLSCheck,5,0,1,2); - KviTalToolTip::add(m_pUseSTARTTLSCheck,__tr2qs_ctx("<center>This check will cause the connection to use the <b>Transport Layer Security</b> " \ - "encryption support. Obviously, this server must have support for this, too. :)</center>","options")); + m_pSupportsSTARTTLSCheck = new QCheckBox(__tr2qs_ctx("Supports STARTTLS protocol","options"),tab); + gl->addWidget(m_pSupportsSTARTTLSCheck,5,0,1,2); + KviTalToolTip::add(m_pSupportsSTARTTLSCheck,__tr2qs_ctx("<center>This check marks the server as dynamically supporting the <b>Transport Layer Security</b> " \ + "protocol. If you enable the proper global option in the Connection/SSL tab, the TLS protocol will be used for this server.</center>","options")); #ifndef COMPILE_SSL_SUPPORT - m_pUseSTARTTLSCheck->setEnabled(false); + m_pSupportsSTARTTLSCheck->setEnabled(false); #endif - m_pUseSTARTTLSCheck->setChecked(s->useSTARTTLS()); + m_pSupportsSTARTTLSCheck->setChecked(s->supportsSTARTTLS()); m_pUseAutoConnect = new QCheckBox(__tr2qs_ctx("Connect to this server at startup","options"),tab); m_pUseAutoConnect->setChecked(s->autoConnect()); @@ -905,6 +905,8 @@ void KviServerDetailsWidget::fillData(KviServer * s) s->setCacheIp(m_pCacheIpCheck->isChecked()); if(m_pUseSSLCheck) s->setUseSSL(m_pUseSSLCheck->isChecked()); + if(m_pSupportsSTARTTLSCheck) + s->setSupportsSTARTTLS(m_pSupportsSTARTTLSCheck->isChecked()); if(m_pIdEditor) s->setId(m_pIdEditor->text()); if(s->id().isEmpty())s->generateUniqueId(); diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h index 2b12c879f..c079e9b4b 100644 --- a/src/modules/options/optw_servers.h +++ b/src/modules/options/optw_servers.h @@ -125,7 +125,7 @@ protected: KviIpEditor * m_pIpEditor; QCheckBox * m_pCacheIpCheck; QCheckBox * m_pUseSSLCheck; - QCheckBox * m_pUseSTARTTLSCheck; + QCheckBox * m_pSupportsSTARTTLSCheck; QCheckBox * m_pUseDefaultInitUMode; QCheckBox * m_pIMode; QCheckBox * m_pWMode; |