[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/kmail
From: Martin Koller <kollix () aon ! at>
Date: 2009-07-31 23:47:31
Message-ID: 1249084051.261737.29730.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1005418 by mkoller:
BUG: 51410
Activate signing if switching from an identity without key to an
identity with key and auto-sign option is set,
M +8 -3 kmcomposewin.cpp
--- trunk/KDE/kdepim/kmail/kmcomposewin.cpp #1005417:1005418
@@ -4126,7 +4126,7 @@
// disable certain actions if there is no PGP user identity set
// for this profile
bool bNewIdentityHasSigningKey = !ident.pgpSigningKey().isEmpty() || \
!ident.smimeSigningKey().isEmpty();
- bool bNewIdentityHasEncryptionKey = !ident.pgpSigningKey().isEmpty() || \
!ident.smimeSigningKey().isEmpty(); + bool bNewIdentityHasEncryptionKey = \
!ident.pgpEncryptionKey().isEmpty() || !ident.smimeEncryptionKey().isEmpty(); \
mAttachMPK->setEnabled( \
Kleo::CryptoBackendFactory::instance()->openpgp() &&
!ident.pgpEncryptionKey().isEmpty() );
// save the state of the sign and encrypt button
@@ -4138,16 +4138,21 @@
mLastSignActionState = mSignAction->isChecked();
setSigning( false );
}
- // restore the last state of the sign and encrypt button
+ // restore the last state of the encrypt button
if ( bNewIdentityHasEncryptionKey && !mLastIdentityHasEncryptionKey ) {
setEncryption( mLastEncryptActionState );
}
+ // if the new identity has a signing key but the last had none, the signing can
+ // not be activated. Therefore set the signing to what is globally defined
if ( bNewIdentityHasSigningKey && !mLastIdentityHasSigningKey ) {
- setSigning( mLastSignActionState );
+ // setSigning() already uses this member as the state of the currently selected \
identity + mLastIdentityHasSigningKey = true;
+ setSigning( GlobalSettings::self()->pgpAutoSign() );
}
mLastIdentityHasSigningKey = bNewIdentityHasSigningKey;
mLastIdentityHasEncryptionKey = bNewIdentityHasEncryptionKey;
+ slotUpdateSignatureAndEncrypionStateIndicators();
setQuotePrefix( uoid );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic