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

List:       kde-commits
Subject:    KDE/kdeutils/kgpg
From:       Rolf Eike Beer <kde () opensource ! sf-tec ! de>
Date:       2008-06-08 7:59:40
Message-ID: 1212911980.802286.2583.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 818278 by dakon:

Don't delete sender in slot, call deleteLater() instead. This should fix a 
bunch of crashes on key operations.

BUG:156888


 M  +4 -4      keyinfodialog.cpp  
 M  +22 -22    kgpginterface.cpp  


--- trunk/KDE/kdeutils/kgpg/keyinfodialog.cpp #818277:818278
@@ -370,7 +370,7 @@
 void KgpgKeyInfo::reloadKey(KgpgInterface *interface)
 {
     KgpgKeyList listkeys = interface->readPublicKeys(true, m_key->fullId());
-    delete interface;
+    interface->deleteLater();
 
     Q_ASSERT(listkeys.count() > 0);
 
@@ -488,7 +488,7 @@
 
 void KgpgKeyInfo::slotSetPhoto(const QPixmap &pixmap, KgpgInterface *interface)
 {
-    delete interface;
+    interface->deleteLater();
 
     QImage img = pixmap.toImage();
     QPixmap pix = QPixmap::fromImage(img.scaled(m_photo->width(), m_photo->height(), \
Qt::KeepAspectRatio)); @@ -531,7 +531,7 @@
     if (res == 1)
         KMessageBox::error(this, i18n("Could not change expiration"), i18n("Bad \
passphrase. Expiration of the key has not been changed."));  
-    delete interface;
+    interface->deleteLater();
     setControlEnable(true);
 }
 
@@ -561,7 +561,7 @@
 
 void KgpgKeyInfo::slotInfoPasswordChanged(const int &res, KgpgInterface *interface)
 {
-    delete interface;
+    interface->deleteLater();
 
     if (res == 2)
         KPassivePopup::message(i18n("Passphrase for the key was changed"), \
                QString(), Images::kgpg(), this);
--- trunk/KDE/kdeutils/kgpg/kgpginterface.cpp #818277:818278
@@ -688,7 +688,7 @@
     if (cycle != "none")
         m_publiclistkeys << m_publickey;
 
-    delete p;
+    p->deleteLater();
     if (!block)
         emit readPublicKeysFinished(m_publiclistkeys, this);
 }
@@ -846,7 +846,7 @@
 
 void KgpgInterface::getKeysFin(GPGProc *gpgProcess)
 {
-	delete gpgProcess;
+	gpgProcess->deleteLater();
 	emit getKeysFinished(m_keystring, this);
 }
 
@@ -974,7 +974,7 @@
 
 void KgpgInterface::signKeyFin()
 {
-    delete m_workProcess;
+    m_workProcess->deleteLater();
     if ((m_success != 0) && (m_success != 5))
         emit signKeyFinished(m_success, m_keyid, this); // signature successful or \
bad passphrase or aborted or already signed  else
@@ -1101,7 +1101,7 @@
 
 void KgpgInterface::keyExpireFin()
 {
-    delete m_workProcess;
+    m_workProcess->deleteLater();
     if (m_success < 4)
         emit keyExpireFinished(m_success, this); // signature successful or bad \
passphrase  else
@@ -1171,7 +1171,7 @@
 
                     if (sendPassphrase(passdlgmessage, m_workProcess, false))
                     {
-                        delete m_workProcess;
+                        m_workProcess->deleteLater();
                         emit changePassFinished(3, this);
                         return;
                     }
@@ -1182,7 +1182,7 @@
                 {
                     if (sendPassphrase(i18n("<qt>Enter new passphrase for \
<b>%1</b><br />If you forget this passphrase all your encrypted files and messages \
will be inaccessible<br /></qt>", userIDs), m_workProcess))  {
-                        delete m_workProcess;
+                        m_workProcess->deleteLater();
                         emit changePassFinished(3, this);
                         return;
                     }
@@ -1198,7 +1198,7 @@
 
 void KgpgInterface::changePassFin()
 {
-    delete m_workProcess;
+    m_workProcess->deleteLater();
     emit changePassFinished(m_success, this);
 }
 
@@ -1251,7 +1251,7 @@
 
 void KgpgInterface::changeTrustFin()
 {
-    delete m_workProcess;
+    m_workProcess->deleteLater();
     emit changeTrustFinished(this);
 }
 
@@ -1277,7 +1277,7 @@
 
 void KgpgInterface::changeDisableFin(int res)
 {
-    delete editprocess;
+    editprocess->deleteLater();
     editprocess = 0;
     emit changeDisableFinished(this, res);
 }
@@ -1352,7 +1352,7 @@
                     p->write("Yes\n");
                 else
                 {
-                    delete p;
+                    p->deleteLater();
                     emit addPhotoFinished(3, this);
                     return;
                 }
@@ -1367,7 +1367,7 @@
 
                 if (sendPassphrase(passdlgmessage, p, false))
                 {
-                    delete p;
+                    p->deleteLater();
                     emit addPhotoFinished(3, this);
                     return;
                 }
@@ -1387,7 +1387,7 @@
 
 void KgpgInterface::addPhotoFin(GPGProc *p)
 {
-    delete p;
+    p->deleteLater();
     emit addPhotoFinished(m_success, this);
 }
 
@@ -1431,7 +1431,7 @@
 
                 if (sendPassphrase(passdlgmessage, p, false))
                 {
-                    delete p;
+                    p->deleteLater();
                     emit deletePhotoFinished(3, this);
                     return;
                 }
@@ -1449,7 +1449,7 @@
 
 void KgpgInterface::deletePhotoFin(GPGProc *p)
 {
-    delete p;
+    p->deleteLater();
     emit deletePhotoFinished(m_success, this);
 }
 
@@ -1515,7 +1515,7 @@
 
 void KgpgInterface::importKeyFinished(GPGProc *p)
 {
-    delete p;
+    p->deleteLater();
 
     QStringList importedKeysIds;
     QStringList importedKeys;
@@ -1642,7 +1642,7 @@
 
                 if (sendPassphrase(passdlgmessage, p, false))
                 {
-                    delete p;
+                    p->deleteLater();
                     emit addUidFinished(3, this);
                     return;
                 }
@@ -1661,7 +1661,7 @@
 
 void KgpgInterface::addUidFin(GPGProc *p)
 {
-    delete p;
+    p->deleteLater();
     emit addUidFinished(m_success, this);
 }
 
@@ -1768,7 +1768,7 @@
                 QString passdlgmessage = i18n("<p><b>Enter passphrase for %1</b>:<br \
/>Passphrase should include non alphanumeric characters and random sequences</p>", \
keyid);  if (sendPassphrase(passdlgmessage, p, true))
                 {
-                    delete p;
+                    p->deleteLater();
                     emit generateKeyFinished(3, this, m_keyname, m_keyemail, \
QString());  return;
                 }
@@ -1796,7 +1796,7 @@
 
 void KgpgInterface::generateKeyFin(GPGProc *p)
 {
-    delete p;
+    p->deleteLater();
     emit generateKeyFinished(m_success, this, m_keyname, m_keyemail, \
m_newfingerprint);  }
 
@@ -1859,7 +1859,7 @@
 
 void KgpgInterface::downloadKeysFin(GPGProc *p)
 {
-    delete p;
+    p->deleteLater();
     m_downloadprocess = 0;
 
     QStringList importedkeys;
@@ -1949,7 +1949,7 @@
 
 void KgpgInterface::uploadKeysFin(GPGProc *p)
 {
-    delete p;
+    p->deleteLater();
     m_uploadprocess = 0;
 
     emit uploadKeysFinished(m_uploadkeys_log, this);
@@ -2006,7 +2006,7 @@
 
 void KgpgInterface::delsignover(GPGProc *p)
 {
-	delete p;
+	p->deleteLater();
 	emit delsigfinished(deleteSuccess);
 }
 


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