File pgp_key_select.diff of Package kdepim4.openSUSE_13.1_Update

commit 5cc79e9246caee7875bd640bd6264476bb7330ce
Author: Sandro Knauß <mail@sandroknauss.de>
Date:   Wed Jan 22 19:08:26 2014 +0100

    make it possible to manually select untrusted PGP keys
    
    Fixes a bug in method "selectKeys", when manually selecting one or more
    keys which are not marked as trusted. Method "selectKeys" is only called
    from method "getEncryptionKeys" in lines: 1656, 1696
    
    (patch written by kolAflash <kolAflash@kolahilft.de>, sponserd by me)
    
    BUG: 328311
    FIXED-IN: 4.12.2
    REVIEW: 115182

diff --git a/messagecomposer/composer/keyresolver.cpp b/messagecomposer/composer/keyresolver.cpp
index 17e7342..a9fcecd 100644
--- a/messagecomposer/composer/keyresolver.cpp
+++ b/messagecomposer/composer/keyresolver.cpp
@@ -1623,7 +1623,7 @@ std::vector<GpgME::Key> Kleo::KeyResolver::selectKeys(
 
   std::vector<GpgME::Key> keys = dlg->selectedKeys();
   keys.erase( std::remove_if( keys.begin(), keys.end(),
-                              NotValidTrustedEncryptionKey ), // -= trusted?
+                              NotValidEncryptionKey ),
                               keys.end() );
   if ( !keys.empty() && dlg->rememberSelection() ) {
     setKeysForAddress( person, dlg->pgpKeyFingerprints(), dlg->smimeFingerprints() );
openSUSE Build Service is sponsored by