Merged revisions 935981 via svnmerge from

svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r935981 | mutz | 2009-03-06 17:20:06 +0100 (Fri, 06 Mar 2009) | 1 line
  
  Consider marginally trusted keys as trusted, too.
........

svn path=/branches/kdepim/enterprise4/kdepim/; revision=938090

keyresolver.cpp

@@ -122,7 +122,7 @@ static bool ValidTrustedOpenPGPEncryptionKey( const GpgME::Key & key ) {
         return false;
   const std::vector<GpgME::UserID> uids = key.userIDs();
   for ( std::vector<GpgME::UserID>::const_iterator it = uids.begin() ; it != uids.end() ; ++it ) {
-    if ( !it->isRevoked() && it->validity() > GpgME::UserID::Marginal )
+    if ( !it->isRevoked() && it->validity() >= GpgME::UserID::Marginal )
       return true;
 #if 0
     else