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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/commands
From:       Marc Mutz <mutz () kde ! org>
Date:       2008-04-22 10:15:06
Message-ID: 1208859306.377486.3481.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 799778 by mutz:

++debug; only start import jobs for non-empty data; fix typo in function name

 M  +10 -7     lookupcertificatescommand.cpp  


--- trunk/KDE/kdepim/kleopatra/commands/lookupcertificatescommand.cpp #799777:799778
@@ -107,7 +107,7 @@
     }
     void startKeyListJob( GpgME::Protocol proto, const QString & str );
     void startDownloadJob( const Key & key );
-    void checkForDownloadFinsished();
+    void checkForDownloadFinished();
 
     QWidget * dialogOrView() const { if ( dialog ) return dialog; else return \
view(); }  
@@ -144,6 +144,7 @@
 }
 
 LookupCertificatesCommand::Private::~Private() {
+    kDebug();
     delete dialog;
 }
 
@@ -163,7 +164,7 @@
 
 }
 
-LookupCertificatesCommand::~LookupCertificatesCommand() {}
+LookupCertificatesCommand::~LookupCertificatesCommand() { kDebug(); }
 
 
 void LookupCertificatesCommand::doStart() {
@@ -305,7 +306,7 @@
     it->job = 0;
     it->error = err;
 
-    checkForDownloadFinsished();
+    checkForDownloadFinished();
 }
 
 void LookupCertificatesCommand::Private::slotCMSDownloadResult( const GpgME::Error & \
err, const QByteArray & keyData ) { @@ -319,10 +320,10 @@
     it->job = 0;
     it->error = err;
 
-    checkForDownloadFinsished();
+    checkForDownloadFinished();
 }
 
-void LookupCertificatesCommand::Private::checkForDownloadFinsished() {
+void LookupCertificatesCommand::Private::checkForDownloadFinished() {
 
     if ( kdtools::any( downloads, mem_fn( &DownloadVariables::job ) ) )
         return; // still jobs to end
@@ -353,8 +354,10 @@
     const QByteArray cms = cmsDownloadData;//combined_nonfailed_data( CMS,     \
                downloads );
     const QByteArray pgp = openPGPDownloadData;//combined_nonfailed_data( OpenPGP, \
downloads );  
-    startImport( CMS,     cms );
-    startImport( OpenPGP, pgp );
+    if ( !cms.isEmpty() )
+        startImport( CMS,     cms );
+    if ( !pgp.isEmpty() )
+        startImport( OpenPGP, pgp );
 }
 
 void LookupCertificatesCommand::Private::slotSaveAsRequested( const std::vector<Key> \
& keys ) {


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