diff options
| author | mio <stigma@disroot.org> | 2025-03-23 16:34:07 +1000 |
|---|---|---|
| committer | mio <stigma@disroot.org> | 2025-04-10 21:08:27 +1000 |
| commit | 625d3c38cd3a49d07b6e1f511fe06d0792440791 (patch) | |
| tree | fd162d316147cdc92138ee5d4555afc95beabd9b /kmail/accountdialog.cpp | |
| parent | 07b2986480b5c85d26facaf4d1f03a5d71c06784 (diff) | |
| download | tdepim-625d3c38cd3a49d07b6e1f511fe06d0792440791.tar.gz tdepim-625d3c38cd3a49d07b6e1f511fe06d0792440791.zip | |
kmail: Rename TLS to STARTTLS and SSL to SSL/TLS
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>
Diffstat (limited to 'kmail/accountdialog.cpp')
| -rw-r--r-- | kmail/accountdialog.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index 8565091d..2967b87d 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -782,11 +782,11 @@ void AccountDialog::makePopAccountPage() i18n("Encryption"), page2 ); mPop.encryptionNone = new TQRadioButton( i18n("&None"), mPop.encryptionGroup ); - mPop.encryptionSSL = - new TQRadioButton( i18n("Use &SSL for secure mail download"), - mPop.encryptionGroup ); mPop.encryptionTLS = - new TQRadioButton( i18n("Use &TLS for secure mail download"), + new TQRadioButton( i18n("Use &StartTLS"), + mPop.encryptionGroup ); + mPop.encryptionSSL = + new TQRadioButton( i18n("Enforce SSL/&TLS"), mPop.encryptionGroup ); connect(mPop.encryptionGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPopEncryptionChanged(int))); @@ -1097,11 +1097,11 @@ void AccountDialog::makeImapAccountPage( bool connected ) i18n("Encryption"), page2 ); mImap.encryptionNone = new TQRadioButton( i18n("&None"), mImap.encryptionGroup ); - mImap.encryptionSSL = - new TQRadioButton( i18n("Use &SSL for secure mail download"), - mImap.encryptionGroup ); mImap.encryptionTLS = - new TQRadioButton( i18n("Use &TLS for secure mail download"), + new TQRadioButton( i18n("Use &StartTLS"), + mImap.encryptionGroup ); + mImap.encryptionSSL = + new TQRadioButton( i18n("Enforce SSL/&TLS"), mImap.encryptionGroup ); connect(mImap.encryptionGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotImapEncryptionChanged(int))); @@ -1499,12 +1499,12 @@ void AccountDialog::slotPopEncryptionChanged(int id) { kdDebug(5006) << "slotPopEncryptionChanged( " << id << " )" << endl; // adjust port - if ( id == SSL || mPop.portEdit->text() == "995" ) - mPop.portEdit->setText( ( id == SSL ) ? "995" : "110" ); + if ( id == EnforceSSL || mPop.portEdit->text() == "995" ) + mPop.portEdit->setText( ( id == EnforceSSL ) ? "995" : "110" ); // switch supported auth methods - mCurCapa = ( id == TLS ) ? mCapaTLS - : ( id == SSL ) ? mCapaSSL + mCurCapa = ( id == StartTLS ) ? mCapaTLS + : ( id == EnforceSSL ) ? mCapaSSL : mCapaNormal; enablePopFeatures( mCurCapa ); const TQButton *old = mPop.authGroup->selected(); @@ -1517,12 +1517,12 @@ void AccountDialog::slotImapEncryptionChanged(int id) { kdDebug(5006) << "slotImapEncryptionChanged( " << id << " )" << endl; // adjust port - if ( id == SSL || mImap.portEdit->text() == "993" ) - mImap.portEdit->setText( ( id == SSL ) ? "993" : "143" ); + if ( id == EnforceSSL || mImap.portEdit->text() == "993" ) + mImap.portEdit->setText( ( id == EnforceSSL ) ? "993" : "143" ); // switch supported auth methods - int authMethods = ( id == TLS ) ? mCapaTLS - : ( id == SSL ) ? mCapaSSL + int authMethods = ( id == StartTLS ) ? mCapaTLS + : ( id == EnforceSSL ) ? mCapaSSL : mCapaNormal; enableImapAuthMethods( authMethods ); TQButton *old = mImap.authGroup->selected(); |