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

List:       kde-commits
Subject:    KDE/kdepim
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2008-09-07 15:14:00
Message-ID: 1220800440.458889.12259.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 858191 by tmcguire:

Merged revisions 856635 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r856635 | osterfeld | 2008-09-03 14:26:09 +0200 (Wed, 03 Sep 2008) | 4 lines
  
  when doing D/V, ignore verification results with no error set and no signatures \
contained, which just means that   there was no signature.
  BUG:170241
........


 _M            . (directory)  
 M  +9 -4      kleopatra/crypto/decryptverifytask.cpp  


** trunk/KDE/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise4/kdepim:1-809779,809818-812631,812633-813585,813587-8 \
13603,813605-813670,813672-816390,816392-817226,817228-817261,817263-817679,817681-818 \
695,818697-819956,819958-819963,819965-823883,823885-827552,827723,827832-829047,82904 \
9-829050,829052-833251,833747,834308,834950-834951,834955-834958,834961-834968,834977- \
834992,835010,835023,835028-835042,835049,835071,835074,835078-835080,835083,835085,83 \
5088-835093,835096,835107,835112-835342,835353,835355,835357-835363,835365-835380,8353 \
82-835383,835395,835397,835400-835403,835408-835411,835415,835426,835430-835432,835434 \
-835435,835437,835439-835440,835447,835451-835938,836295,836363,836390,836393-836394,8 \
36404,836408,836472,836498,836510,836512,836524,837586,837719,837823,839641,839986-840 \
017,840019-840127,841817,841844,841986,841990,842323,842333,842495,842562-843750,84375 \
2-843753,843755-849403,849405-849784,849786-850255,850258-850261,850263-850305,850307-850329,850331-850387,850389-850421,850423-85
  0483,850485-850486,850488-850497,850499-850502,850504-850505,850507-850509,850511,85 \
0513-850573,850575-851249,851251-851253,851256-851293,851297-851306,851308-851309,8513 \
12,851314-851316,851320,851322,851325-851328,851333,851336,851342,851349,851351-851352 \
,851354,851358,851360-851371,851373,851376,851378,851380,851384,851389,851391,851395-8 \
51397,851399-852143,852637,852652,852736,852743,852759,853293,853769,853818,853947-853957,853973,853982,853985,854004,854007,854025,854085,854399,854550-854628,856353 \
/branches/kdepim/kmail-soc:1-809833,812465,826213-826424  + \
/branches/kdepim/enterprise4/kdepim:1-809779,809818-812631,812633-813585,813587-813603 \
,813605-813670,813672-816390,816392-817226,817228-817261,817263-817679,817681-818695,8 \
18697-819956,819958-819963,819965-823883,823885-827552,827723,827832-829047,829049-829 \
050,829052-833251,833747,834308,834950-834951,834955-834958,834961-834968,834977-83499 \
2,835010,835023,835028-835042,835049,835071,835074,835078-835080,835083,835085,835088- \
835093,835096,835107,835112-835342,835353,835355,835357-835363,835365-835380,835382-83 \
5383,835395,835397,835400-835403,835408-835411,835415,835426,835430-835432,835434-8354 \
35,835437,835439-835440,835447,835451-835938,836295,836363,836390,836393-836394,836404 \
,836408,836472,836498,836510,836512,836524,837586,837719,837823,839641,839986-840017,8 \
40019-840127,841817,841844,841986,841990,842323,842333,842495,842562-843750,843752-843 \
753,843755-849403,849405-849784,849786-850255,850258-850261,850263-850305,850307-850329,850331-850387,850389-850421,850423-85
  0483,850485-850486,850488-850497,850499-850502,850504-850505,850507-850509,850511,85 \
0513-850573,850575-851249,851251-851253,851256-851293,851297-851306,851308-851309,8513 \
12,851314-851316,851320,851322,851325-851328,851333,851336,851342,851349,851351-851352 \
,851354,851358,851360-851371,851373,851376,851378,851380,851384,851389,851391,851395-8 \
51397,851399-852143,852637,852652,852736,852743,852759,853293,853769,853818,853947-853 \
957,853973,853982,853985,854004,854007,854025,854085,854399,854550-854628,856353,856635 \
                /branches/kdepim/kmail-soc:1-809833,812465,826213-826424
--- trunk/KDE/kdepim/kleopatra/crypto/decryptverifytask.cpp #858190:858191
@@ -91,7 +91,6 @@
     return job ? job->auditLogAsHtml() : QString();
 }
 
-
 static bool addrspec_equal( const AddrSpec & lhs, const AddrSpec & rhs, \
                Qt::CaseSensitivity cs  ) {
     return lhs.localPart.compare( rhs.localPart, cs ) == 0 && lhs.domain.compare( \
rhs.domain, Qt::CaseInsensitive ) == 0;  }
@@ -154,6 +153,12 @@
     return std::find_if( keys.begin(), keys.end(), bind( keyContainsMailbox, _1, \
mbox ) ) != keys.end();  }
 
+static bool relevantInDecryptVerifyContext( const VerificationResult & r ) {
+    // for D/V operations, we ignore verification results which are not errors and \
contain +    // no signatures (which means that the data was just not signed)
+    return r.error() || r.numSignatures() > 0;
+}
+
 static QString signatureSummaryToString( int summary )
 {
     if ( summary & Signature::None )
@@ -482,7 +487,7 @@
 
 static QString formatDecryptVerifyResultOverview( const DecryptionResult & dr, const \
VerificationResult & vr, const  DecryptVerifyResult::SenderInfo & info )  {
-    if ( IsErrorOrCanceled( dr ) )
+    if ( IsErrorOrCanceled( dr ) || !relevantInDecryptVerifyContext( vr ) )
         return formatDecryptionResultOverview( dr );
     return formatVerificationResultOverview( vr, info );
 }
@@ -718,8 +723,8 @@
 }
 
 Task::Result::VisualCode DecryptVerifyResult::code() const {
-    if ( d->m_type == DecryptVerify || d->m_type == Verify )
-        return codeForVerificationResult( d->m_verificationResult );
+    if ( ( d->m_type == DecryptVerify || d->m_type == Verify ) && \
relevantInDecryptVerifyContext( verificationResult() ) ) +        return \
codeForVerificationResult( verificationResult() );  return hasError() ? NeutralError \
: NeutralSuccess;  }
 


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