diff options
| author |  Szymon Tomasz Stefanek | 2011-12-21 03:17:39 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2011-12-21 03:17:39 +0000 |
| commit | 53621ece0b740f9ec234073cc20e763836112e25 (patch) | |
| tree | 9f178e989d9c1317f419bab60c1e994c14cf7565 /src/modules/options/OptionsWidget_connection.cpp | |
| parent | Better handling of ACKs in DCC transfers on asymmetric lines. Also a small bu... (diff) | |
| download | KVIrc-53621ece0b740f9ec234073cc20e763836112e25.tar.gz KVIrc-53621ece0b740f9ec234073cc20e763836112e25.tar.bz2 KVIrc-53621ece0b740f9ec234073cc20e763836112e25.zip | |
StartTls and Sasl are now per-server options. These are no longer needed.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5996 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/options/OptionsWidget_connection.cpp')
| -rw-r--r-- | src/modules/options/OptionsWidget_connection.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/modules/options/OptionsWidget_connection.cpp b/src/modules/options/OptionsWidget_connection.cpp index 3456a1bdf..b12201f9b 100644 --- a/src/modules/options/OptionsWidget_connection.cpp +++ b/src/modules/options/OptionsWidget_connection.cpp @@ -86,9 +86,10 @@ OptionsWidget_connection::OptionsWidget_connection(QWidget * parent) connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>0 sec</b><br>Maximum value: <b>86400 sec</b></center>","options")); - b = addBoolSelector(this,__tr2qs_ctx("Use the SASL authentication protocol if available","options"),&(KVI_OPTION_BOOL(KviOption_boolUseSaslIfAvailable)),true); - mergeTip(b,__tr2qs_ctx("<center>When available and enabled of the specific server, KVIrc will try to authenticate the user using the SASL procotol</center>","options")); - addWidgetToLayout(b,0,2,0,2); + // This is now handled per-server. + //b = addBoolSelector(this,__tr2qs_ctx("Use the SASL authentication protocol if available","options"),&(KVI_OPTION_BOOL(KviOption_boolUseSaslIfAvailable)),true); + //mergeTip(b,__tr2qs_ctx("<center>When available and enabled of the specific server, KVIrc will try to authenticate the user using the SASL procotol</center>","options")); + //addWidgetToLayout(b,0,2,0,2); addRowSpacer(0,3,4,3); } @@ -126,9 +127,10 @@ OptionsWidget_connectionSsl::OptionsWidget_connectionSsl(QWidget * parent) &(KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPass)),KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)); connect(b,SIGNAL(toggled(bool)),p,SLOT(setEnabled(bool))); - b = addBoolSelector(this,__tr2qs_ctx("Use the STARTTLS security protocol if available","options"),&(KVI_OPTION_BOOL(KviOption_boolUseStartTlsIfAvailable)),true); - mergeTip(b,__tr2qs_ctx("<center>This option will cause KVIrc to try to reconnect to the server using an encrypted connection</center>","options")); - addWidgetToLayout(b,0,2,0,2); + // This is now handled per-server. + //b = addBoolSelector(this,__tr2qs_ctx("Use the STARTTLS security protocol if available","options"),&(KVI_OPTION_BOOL(KviOption_boolUseStartTlsIfAvailable)),true); + //mergeTip(b,__tr2qs_ctx("<center>This option will cause KVIrc to try to reconnect to the server using an encrypted connection</center>","options")); + //addWidgetToLayout(b,0,2,0,2); addRowSpacer(0,3,0,3); #else |