diff options
| author | mio <stigma@disroot.org> | 2025-03-23 16:34:07 +1000 |
|---|---|---|
| committer | mio <stigma@disroot.org> | 2025-04-11 19:56:20 +1000 |
| commit | 409b67ac0559a06dc58da81fc90f0ba959d6068c (patch) | |
| tree | 14d90f3f5a3fdae4ec8e52022a3744156cfc7e0a /kmail/kmtransport.cpp | |
| parent | 0a058702f8c011f1b76ab4fbce8a996c50d5bbda (diff) | |
| download | tdepim-409b67ac0559a06dc58da81fc90f0ba959d6068c.tar.gz tdepim-409b67ac0559a06dc58da81fc90f0ba959d6068c.zip | |
kmail: Rename TLS to STARTTLS and SSL to SSL/TLSr14.1.4
Avoid confusion between TLS and STARTTLS in the UI when configuring
accounts.
The values of EncryptionMethods (private) match the ID of the radio
buttons, and since the button order changed, the values need to as well.
Signed-off-by: mio <stigma@disroot.org>
(cherry picked from commit 625d3c38cd3a49d07b6e1f511fe06d0792440791)
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 ); |