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

List:       kmail-devel
Subject:    [Bug 90481] DATA LOSS: When recipient is set to Inline GPG and
From:       Till Adam <adam () kde ! org>
Date:       2004-12-28 12:01:43
Message-ID: 20041228120143.5531.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
        
http://bugs.kde.org/show_bug.cgi?id=90481        
adam kde org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From adam kde org  2004-12-28 13:01 -------
CVS commit by tilladam: 

Don't lose the composed mail when the composer tells the KeyResolver to
look for one format and the address book entry specifies a different 
format for encryption. Allow signing with the format specified in the
address book even if it differs from the one set it in the composer.

Thanks for reporting, Gilles.

BUG: 90480
BUG: 90481


  M +8 -8      keyresolver.cpp   1.13


--- kdepim/kmail/keyresolver.cpp  #1.12:1.13
 @ -1038,6 +1038,4  @ Kpgp::Result Kleo::KeyResolver::resolveS
 
   for ( unsigned int i = 0 ; i < numConcreteCryptoMessageFormats ; ++i ) {
-    if ( !( concreteCryptoMessageFormats[i] & mCryptoMessageFormats ) )
-      continue;
     if ( signingKeysFor( concreteCryptoMessageFormats[i] ).empty() )
       continue; // skip;
 @ -1425,9 +1423,10  @ void Kleo::KeyResolver::addKeys( const s
     SplitInfo si( it->address );
     CryptoMessageFormat f = AutoFormat;
-    for ( unsigned int i = 0 ; i < numConcreteCryptoMessageFormats ; ++i )
-      if ( mCryptoMessageFormats & concreteCryptoMessageFormats[i] & it->format ) {
+    for ( unsigned int i = 0 ; i < numConcreteCryptoMessageFormats ; ++i ) {
+      if ( concreteCryptoMessageFormats[i] & it->format ) {
         f = concreteCryptoMessageFormats[i];
         break;
       }
+    }
     if ( f == AutoFormat )
       kdWarning() << "Kleo::KeyResolver::addKeys(): Something went wrong. Didn't find a format for \""
 @ -1463,4 +1462,5  @ Kleo::KeyResolver::ContactPreferences& K
     pos = d->mContactPreferencesMap.insert(
       Private::ContactPreferencesMap::value_type( address, pref ) ).first;
+    
   }
   return (*pos).second;
_______________________________________________
KMail developers mailing list
KMail-devel@kde.org
https://mail.kde.org/mailman/listinfo/kmail-devel
[prev in list] [next in list] [prev in thread] [next in thread]