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

List:       kde-commits
Subject:    KDE/kdepim/libkleo/backends/qgpgme
From:       Marc Mutz <mutz () kde ! org>
Date:       2008-05-07 7:16:40
Message-ID: 1210144600.050431.21542.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 804945 by mutz:

Get the operation results _before_ trying to get the audit log, otherwise the former \
will be NULL.

 M  +1 -0      qgpgmechangeexpiryjob.cpp  
 M  +1 -0      qgpgmedecryptjob.cpp  
 M  +1 -0      qgpgmedecryptverifyjob.cpp  
 M  +1 -0      qgpgmedeletejob.cpp  
 M  +3 -1      qgpgmedownloadjob.cpp  
 M  +1 -0      qgpgmeencryptjob.cpp  
 M  +3 -1      qgpgmeexportjob.cpp  
 M  +3 -1      qgpgmeimportjob.cpp  
 M  +0 -1      qgpgmejob.cpp  
 M  +4 -1      qgpgmekeygenerationjob.cpp  
 M  +1 -0      qgpgmesignencryptjob.cpp  
 M  +1 -0      qgpgmesignjob.cpp  
 M  +1 -0      qgpgmeverifydetachedjob.cpp  
 M  +1 -0      qgpgmeverifyopaquejob.cpp  


--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmechangeexpiryjob.cpp #804944:804945
@@ -73,6 +73,7 @@
 }
 
 void Kleo::QGpgMEChangeExpiryJob::doOperationDoneEvent( const GpgME::Error & error ) \
{ +  getAuditLog();
   emit result( error );
 }
 
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmedecryptjob.cpp #804944:804945
@@ -100,6 +100,7 @@
     const GpgME::DecryptionResult res = mCtx->decryptionResult();
     const QByteArray plainText = outData();
     resetQIODeviceDataObjects();
+    getAuditLog();
     emit result( res, plainText );
 }
 
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmedecryptverifyjob.cpp \
#804944:804945 @@ -102,6 +102,7 @@
     const GpgME::VerificationResult vr = mCtx->verificationResult();
     const QByteArray plainText = outData();
     resetQIODeviceDataObjects();
+    getAuditLog();
     emit result( dr, vr, plainText );
 }
 
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmedeletejob.cpp #804944:804945
@@ -60,6 +60,7 @@
 }
 
 void Kleo::QGpgMEDeleteJob::doOperationDoneEvent( const GpgME::Error & error ) {
+  getAuditLog();
   emit result( error );
 }
 
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmedownloadjob.cpp #804944:804945
@@ -90,7 +90,9 @@
 }
 
 void Kleo::QGpgMEDownloadJob::doOperationDoneEvent( const GpgME::Error & error ) {
-  emit result( error, outData() );
+  const QByteArray data = outData();
+  getAuditLog();
+  emit result( error, data );
 }
 
 #include "qgpgmedownloadjob.moc"
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmeencryptjob.cpp #804944:804945
@@ -143,6 +143,7 @@
   mResult = mCtx->encryptionResult();
   const QByteArray ciphertext = outData();
   resetQIODeviceDataObjects();
+  getAuditLog();
   emit result( mResult, ciphertext );
 }
 
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmeexportjob.cpp #804944:804945
@@ -68,7 +68,9 @@
 }
 
 void Kleo::QGpgMEExportJob::doOperationDoneEvent( const GpgME::Error & error ) {
-  emit result( error, outData() );
+  const QByteArray data = outData();
+  getAuditLog();
+  emit result( error, data );
 }
 
 #include "qgpgmeexportjob.moc"
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmeimportjob.cpp #804944:804945
@@ -70,7 +70,9 @@
 }
 
 void Kleo::QGpgMEImportJob::doOperationDoneEvent( const GpgME::Error & ) {
-  emit result( mCtx->importResult() );
+  const GpgME::ImportResult res = mCtx->importResult();
+  getAuditLog();
+  emit result( res );
 }
 
 
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmejob.cpp #804944:804945
@@ -292,7 +292,6 @@
 
 void Kleo::QGpgMEJob::doSlotOperationDoneEvent( GpgME::Context * context, const \
GpgME::Error & e ) {  if ( context == mCtx ) {
-    getAuditLog();
     doEmitDoneSignal();
     doOperationDoneEvent( e );
     if ( mEventLoop )
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmekeygenerationjob.cpp \
#804944:804945 @@ -77,7 +77,10 @@
 }
 
 void Kleo::QGpgMEKeyGenerationJob::doOperationDoneEvent( const GpgME::Error & ) {
-  emit result( mCtx->keyGenerationResult(), mPubKeyDataProvider ? \
mPubKeyDataProvider->data() : QByteArray() ); +  const GpgME::KeyGenerationResult res \
= mCtx->keyGenerationResult(); +  const QByteArray data = mPubKeyDataProvider ? \
mPubKeyDataProvider->data() : QByteArray() ; +  getAuditLog();
+  emit result( res, data );
 }
 
 #include "qgpgmekeygenerationjob.moc"
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmesignencryptjob.cpp #804944:804945
@@ -165,6 +165,7 @@
   mResult.second = mCtx->encryptionResult();
   const QByteArray cipherText = outData();
   resetQIODeviceDataObjects();
+  getAuditLog();
   emit result( mResult.first, mResult.second, cipherText );
 }
 
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmesignjob.cpp #804944:804945
@@ -153,6 +153,7 @@
   mResult = mCtx->signingResult();
   const QByteArray cipherText = outData();
   resetQIODeviceDataObjects();
+  getAuditLog();
   emit result( mResult, cipherText );
 }
 
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmeverifydetachedjob.cpp \
#804944:804945 @@ -103,6 +103,7 @@
 void Kleo::QGpgMEVerifyDetachedJob::doOperationDoneEvent( const GpgME::Error & ) {
     const GpgME::VerificationResult vr = mCtx->verificationResult();
     resetQIODeviceDataObjects();
+    getAuditLog();
     emit result( vr );
 }
 
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmeverifyopaquejob.cpp #804944:804945
@@ -100,6 +100,7 @@
     const GpgME::VerificationResult vr = mCtx->verificationResult();
     const QByteArray plainText = outData();
     resetQIODeviceDataObjects();
+    getAuditLog();
     emit result( vr, plainText );
 }
 


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