[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 12:36:12
Message-ID: 1208867772.629946.8157.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 799812 by mutz:

Close the dialog on cancel, cancel when dialog is rejected.

 M  +6 -0      lookupcertificatescommand.cpp  


--- trunk/KDE/kdepim/kleopatra/commands/lookupcertificatescommand.cpp #799811:799812
@@ -190,6 +190,8 @@
              q, SLOT(slotImportRequested(std::vector<GpgME::Key>)) );
     connect( dialog, SIGNAL(detailsRequested(GpgME::Key)),
              q, SLOT(slotDetailsRequested(GpgME::Key)) );
+    connect( dialog, SIGNAL(rejected()),
+             q, SLOT(cancel()) );
 }
 
 void LookupCertificatesCommand::Private::slotSearchTextChanged( const QString & str ) {
@@ -370,6 +372,10 @@
 
 void LookupCertificatesCommand::doCancel() {
     ImportCertificatesCommand::doCancel();
+    if ( QDialog * const dlg = d->dialog ) {
+        d->dialog = 0;
+        dlg->close();
+    }
 }
 
 void LookupCertificatesCommand::Private::showError( QWidget * parent, const KeyListResult & result ) {
[prev in list] [next in list] [prev in thread] [next in thread]