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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/uiserver
From:       Marc Mutz <mutz () kde ! org>
Date:       2008-02-07 15:09:00
Message-ID: 1202396940.570411.25671.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 772028 by mutz:

Refactoring

 M  +5 -13     decryptverifycommand.cpp  


--- trunk/KDE/kdepim/kleopatra/uiserver/decryptverifycommand.cpp #772027:772028
@@ -499,24 +499,16 @@
 
             const unsigned int classification = classify( fname );
 
-            if ( mayBeOpaqueSignature( classification ) || mayBeCipherText( \
classification ) ) { +            if ( mayBeOpaqueSignature( classification ) || \
mayBeCipherText( classification ) || mayBeDetachedSignature( classification ) ) {  
                 DecryptVerifyOperationWidget * const op = wizard->operationWidget( \
counter++ );  kleo_assert( op != 0 );
 
-                op->setMode( DecryptVerifyOperationWidget::DecryptVerifyOpaque );
-                op->setInputFileName( fname );
-                op->setSignedDataFileName( findSignedData( fname ) );
+                if ( mayBeOpaqueSignature( classification ) || mayBeCipherText( \
classification ) ) +                    op->setMode( \
DecryptVerifyOperationWidget::DecryptVerifyOpaque ); +                else
+                    op->setMode( \
DecryptVerifyOperationWidget::VerifyDetachedWithSignature );  
-                files.push_back( file );
-
-            } else if ( mayBeDetachedSignature( classification ) ) {
-                // heuristics say it's a detached signature
-
-                DecryptVerifyOperationWidget * const op = wizard->operationWidget( \
                counter++ );
-                kleo_assert( op != 0 );
-
-                op->setMode( \
DecryptVerifyOperationWidget::VerifyDetachedWithSignature );  op->setInputFileName( \
fname );  op->setSignedDataFileName( findSignedData( fname ) );
 


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