diff options
Diffstat (limited to 'kmail/kmtransport.cpp')
| -rw-r--r-- | kmail/kmtransport.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp index 764c1720..44c8b3f0 100644 --- a/kmail/kmtransport.cpp +++ b/kmail/kmtransport.cpp @@ -502,10 +502,10 @@ void KMTransportDialog::makeSmtpPage() i18n("Encryption"), page2 ); mSmtp.encryptionNone = new TQRadioButton( i18n("&None"), mSmtp.encryptionGroup ); - mSmtp.encryptionSSL = - new TQRadioButton( i18n("&SSL"), mSmtp.encryptionGroup ); mSmtp.encryptionTLS = - new TQRadioButton( i18n("&TLS"), mSmtp.encryptionGroup ); + new TQRadioButton( i18n("Use &StartTLS"), mSmtp.encryptionGroup ); + mSmtp.encryptionSSL = + new TQRadioButton( i18n("Enforce SSL/&TLS"), mSmtp.encryptionGroup ); connect(mSmtp.encryptionGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotSmtpEncryptionChanged(int))); vlay->addWidget( mSmtp.encryptionGroup ); @@ -652,13 +652,13 @@ void KMTransportDialog::slotRequiresAuthClicked() void KMTransportDialog::slotSmtpEncryptionChanged(int id) { kdDebug(5006) << "KMTransportDialog::slotSmtpEncryptionChanged( " << id << " )" << endl; - // adjust SSL port: - if (id == SSL || mSmtp.portEdit->text() == "465") - mSmtp.portEdit->setText((id == SSL) ? "465" : "25"); + // adjust SSL/TLS port: + if (id == EnforceSSL || mSmtp.portEdit->text() == "465") + mSmtp.portEdit->setText((id == EnforceSSL) ? "465" : "25"); // switch supported auth methods: TQButton * old = mSmtp.authGroup->selected(); - int authMethods = id == TLS ? mAuthTLS : id == SSL ? mAuthSSL : mAuthNone ; + int authMethods = id == StartTLS ? mAuthTLS : id == EnforceSSL ? mAuthSSL : mAuthNone ; enableAuthMethods( authMethods ); if ( !old->isEnabled() ) checkHighest( mSmtp.authGroup ); |