[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kgpg/Applications/17.04] /: Immediately honor encryption with untrusted keys setting
From:       Rolf Eike Beer <null () kde ! org>
Date:       2017-06-30 19:03:56
Message-ID: E1dR1Cu-0002gv-Cz () code ! kde ! org
[Download RAW message or body]

Git commit cc2362ff645ca5e85d1344eed70409c166a1a95e by Rolf Eike Beer.
Committed on 30/06/2017 at 19:02.
Pushed by dakon into branch 'Applications/17.04'.

Immediately honor encryption with untrusted keys setting

The previous fix was incomplete as it did not move the connect() to the right
place.

Thanks to rkfg for the patch.

BUGS:278238,381820
FIXED-IN:17.04.3

M  +2    -1    selectpublickeydialog.cpp

https://commits.kde.org/kgpg/cc2362ff645ca5e85d1344eed70409c166a1a95e

diff --git a/selectpublickeydialog.cpp b/selectpublickeydialog.cpp
index ec922dc..9df6635 100644
--- a/selectpublickeydialog.cpp
+++ b/selectpublickeydialog.cpp
@@ -120,6 +120,8 @@ KgpgSelectPublicKeyDlg::KgpgSelectPublicKeyDlg(QWidget *parent, \
KGpgItemModel *m  
     m_cbuntrusted = new QCheckBox(i18n("Allow encryption with untrusted keys"), \
optionsbox);  optionsboxVBoxLayout->addWidget(m_cbuntrusted);
+    // connect before setting the state so the model gets the right state from the \
start +    connect(m_cbuntrusted, &QCheckBox::toggled, this, \
&KgpgSelectPublicKeyDlg::slotUntrusted);  \
                m_cbuntrusted->setChecked(KGpgSettings::allowUntrustedKeys());
     m_cbuntrusted->setWhatsThis(i18n("<b>Allow encryption with untrusted keys</b>: \
                when you import a public key, it is usually "
                     "marked as untrusted and you cannot use it unless you sign it in \
order to make it 'trusted'. Checking this " @@ -127,7 +129,6 @@ \
KgpgSelectPublicKeyDlg::KgpgSelectPublicKeyDlg(QWidget *parent, KGpgItemModel *m  
     m_cbhideid = new QCheckBox(i18n("Hide user id"), optionsbox);
     optionsboxVBoxLayout->addWidget(m_cbhideid);
-    connect(m_cbuntrusted, &QCheckBox::toggled, this, \
&KgpgSelectPublicKeyDlg::slotUntrusted);  \
                m_cbhideid->setChecked(KGpgSettings::hideUserID());
     m_cbhideid->setWhatsThis(i18n("<b>Hide user ID</b>: Do not put the keyid into \
                encrypted packets. This option hides the receiver "
                     "of the message and is a countermeasure against traffic \
analysis. It may slow down the decryption process because "


[prev in list] [next in list] [prev in thread] [next in thread]