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

List:       kde-commits
Subject:    kdeutils/kgpg
From:       Jean-Baptiste Mardelle <bj () altern ! org>
Date:       2005-02-03 13:11:57
Message-ID: 20050203131157.BA9501D16A () office ! kde ! org
[Download RAW message or body]

CVS commit by mardelle: 

Don't crash on keyserver operations
CCMAIL: 98240-done@bugs.kde.org


  M +4 -7      keyservers.cpp   1.47


--- kdeutils/kgpg/keyservers.cpp  #1.46:1.47
@@ -361,5 +360,5 @@ void keyServer::slotExport(QString keyId
         importpop->show();
         connect(importpop,SIGNAL(destroyed ()),this,SLOT(abortExport()));
-        connect(Buttonabort,SIGNAL(clicked ()),this,SLOT(abortExport()));
+        connect(Buttonabort,SIGNAL(clicked ()),importpop,SLOT(close()));
 }
 
@@ -367,5 +366,4 @@ void keyServer::abortExport()
 {
         QApplication::restoreOverrideCursor();
-        importpop->close();
         if (exportproc->isRunning())
         {
@@ -418,4 +415,5 @@ void keyServer::slotImport()
         QObject::connect(importproc, SIGNAL(readReady(KProcIO *)),this, \
SLOT(slotimportread(KProcIO *)));  importproc->start(KProcess::NotifyOnExit,true);
+        importproc->closeWhenDone();
         QApplication::setOverrideCursor(QCursor(Qt::BusyCursor));
         importpop = new QDialog( this,0,true,Qt::WDestructiveClose);
@@ -429,5 +427,5 @@ void keyServer::slotImport()
         importpop->adjustSize();
         importpop->show();
-        connect(Buttonabort,SIGNAL(clicked()),this,SLOT(abortImport()));
+        connect(Buttonabort,SIGNAL(clicked()),importpop,SLOT(close()));
         connect(importpop,SIGNAL(destroyed ()),this,SLOT(abortImport()));
 }
@@ -436,5 +434,4 @@ void keyServer::abortImport()
 {
         QApplication::restoreOverrideCursor();
-        importpop->close();
         if (importproc->isRunning())
         {


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