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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdepim/kmail
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-02-09 17:34:23
Message-ID: 20040209173423.9C3709840 () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

> From aegypten_branch: Don't disable sign/encrypt if we're using S/MIME and no \
> OpenPGP key has been specified for this identity.


  M +6 -2      kmcomposewin.cpp   1.770.2.2


--- kdepim/kmail/kmcomposewin.cpp  #1.770.2.1:1.770.2.2
@@ -4725,5 +4725,7 @@ void KMComposeWin::setEncryption( bool e
   // an encryption key for the current identity
   if ( encrypt && Kpgp::Module::getKpgp()->encryptToSelf()
-               && !mLastIdentityHasOpenPgpKey ) {
+               && !mLastIdentityHasOpenPgpKey
+               // ### hack needed as long as we don't specify S/MIME keys in \
identities. +               && ( !mSelectedCryptPlug || \
mSelectedCryptPlug->protocol() == "openpgp" ) ) {  if ( setByUser ) {
       KMessageBox::sorry( this,
@@ -4776,5 +4778,7 @@ void KMComposeWin::setSigning( bool sign
 
   // check if the user defined a signing key for the current identity
-  if ( sign && !mLastIdentityHasOpenPgpKey ) {
+  if ( sign && !mLastIdentityHasOpenPgpKey
+            // ### hack needed as long as we don't specify S/MIME keys in \
identities. +            && ( !mSelectedCryptPlug || mSelectedCryptPlug->protocol() \
== "openpgp" ) ) {  if ( setByUser ) {
       KMessageBox::sorry( this,


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