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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/crypto
From:       Frank Osterfeld <frank.osterfeld () kdemail ! net>
Date:       2008-05-08 15:55:50
Message-ID: 1210262150.247937.4994.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 805436 by osterfeld:

handle creationTime() == 0 correctly
Remove detailed error for bad signatures, as it's always "Bad signature" and is thus \
redundant

 M  +6 -6      decryptverifytask.cpp  


--- trunk/KDE/kdepim/kleopatra/crypto/decryptverifytask.cpp #805435:805436
@@ -159,16 +159,16 @@
 static QString formatSigningInformation( const Signature & sig, const Key & key ) {
     if ( sig.isNull() )
         return QString();
-    const QDateTime dt = QDateTime::fromTime_t( sig.creationTime() );
+    const QDateTime dt = sig.creationTime() != 0 ? QDateTime::fromTime_t( \
                sig.creationTime() ) : QDateTime();
     const QString signer = key.isNull() ? QString() : \
renderKeyEMailOnlyNameAsFallback( key );  const bool haveKey = !key.isNull();
     const bool haveSigner = !signer.isEmpty();
     const bool haveDate = dt.isValid();
     if ( !haveKey )
         if ( haveDate )
-            return i18n( "Message was signed on %1 with unknown key %2.", \
formatDate( dt ), sig.fingerprint() ); +            return i18n( "Message was signed \
on %1 with unknown key %2.", formatDate( dt ), renderFingerprint( sig.fingerprint() ) \
);  else
-            return i18n( "Message was signed with unknown key %1.", \
sig.fingerprint() ); +            return i18n( "Message was signed with unknown key \
%1.", renderFingerprint( sig.fingerprint() ) );  if ( haveSigner )
         if ( haveDate )
             return i18nc( "date, key owner, key ID",
@@ -312,11 +312,11 @@
     if ( red )
         if ( key.isNull() )
             if ( const char * fpr = sig.fingerprint() )
-                return text + i18n("Bad signature by unknown key %1: %2", \
signatureSummaryToString( sig.summary() ) ); +                return text + i18n("Bad \
signature by unknown key %1.", renderFingerprint( fpr ) );  else
-                return text + i18n("Bad signature by an unknown key: %1", \
signatureSummaryToString( sig.summary() ) ); +                return text + i18n("Bad \
signature by an unknown key." );  else
-            return text + i18n("Bad signature by %1: %2", renderKey( key ), \
signatureSummaryToString( sig.summary() ) ); +            return text + i18n("Bad \
signature by %1.", renderKey( key ) );  if ( key.isNull() )
         if ( const char * fpr = sig.fingerprint() )
             return text + i18n("Invalid signature by unknown key %1: %2", \
renderFingerprint( fpr ), signatureSummaryToString( sig.summary() ) );


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