openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File r709084.diff of Package kdepim3

------------------------------------------------------------------------
r709084 | tilladam | 2007-09-06 16:33:00 +0200 (Thu, 06 Sep 2007) | 4 lines

Store the crypto type as well, across drafts (and templates, incidently).

Kolab Issue 1924.

------------------------------------------------------------------------
--- kmail/kmcomposewin.cpp
+++ kmail/kmcomposewin.cpp
@@ -1838,6 +1838,9 @@ void KMComposeWin::setMsg(KMMessage* new
     mLastSignActionState = (mMsg->headerField( "X-KMail-SignatureActionEnabled" ) == "true");
   if ( mMsg->headers().FindField( "X-KMail-EncryptActionEnabled" ) )
     mLastEncryptActionState = (mMsg->headerField( "X-KMail-EncryptActionEnabled" ) == "true");
+  if ( mMsg->headers().FindField( "X-KMail-CryptoMessageFormat" ) )
+    mCryptoModuleAction->setCurrentItem( format2cb( static_cast<Kleo::CryptoMessageFormat>(
+                    mMsg->headerField( "X-KMail-CryptoMessageFormat" ).toInt() ) ) );
 
   mLastIdentityHasSigningKey = !ident.pgpSigningKey().isEmpty() || !ident.smimeSigningKey().isEmpty();
   mLastIdentityHasEncryptionKey = !ident.pgpEncryptionKey().isEmpty() || !ident.smimeEncryptionKey().isEmpty();
@@ -4052,9 +4055,11 @@ void KMComposeWin::doSend( KMail::Messag
       // signing and encryption state, so let's add a header instead
     mMsg->setHeaderField( "X-KMail-SignatureActionEnabled", mSignAction->isChecked()? "true":"false" );
     mMsg->setHeaderField( "X-KMail-EncryptActionEnabled", mEncryptAction->isChecked()? "true":"false"  );
+    mMsg->setHeaderField( "X-KMail-CryptoMessageFormat", QString::number( cryptoMessageFormat() ) );
   } else {
     mMsg->removeHeaderField( "X-KMail-SignatureActionEnabled" );
     mMsg->removeHeaderField( "X-KMail-EncryptActionEnabled" );
+    mMsg->removeHeaderField( "X-KMail-CryptoMessageFormat" );
   }

Places

File r709084.diff of Package kdepim3

Places