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

List:       kde-commits
Subject:    branches/KDE/4.3/kdeutils/kgpg
From:       Rolf Eike Beer <kde () opensource ! sf-tec ! de>
Date:       2009-07-10 18:48:39
Message-ID: 1247251719.224545.7170.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 994574 by dakon:

make "encrypt clipboard" work again

backport of r994572


 M  +4 -2      keysmanager.cpp  
 M  +2 -1      keysmanager.h  


--- branches/KDE/4.3/kdeutils/kgpg/keysmanager.cpp #994573:994574
@@ -2596,7 +2596,7 @@
 			selec = dialog->selectedKeys();
 
 		KGpgTextInterface *txtEncrypt = new KGpgTextInterface();
-		connect (txtEncrypt, SIGNAL(txtEncryptionFinished(QString)), \
SLOT(slotSetClip(QString))); +		connect (txtEncrypt, \
SIGNAL(txtEncryptionFinished(QString, KGpgTextInterface *)), \
SLOT(slotSetClip(QString, KGpgTextInterface *)));  \
m_trayicon->setStatus(Experimental::KNotificationItem::Active);  \
txtEncrypt->encryptText(cliptext, selec, options);  }
@@ -2605,8 +2605,10 @@
 }
 
 void
-KeysManager::slotSetClip(const QString &newtxt)
+KeysManager::slotSetClip(const QString &newtxt, KGpgTextInterface *iface)
 {
+	iface->deleteLater();
+
 	m_trayicon->setStatus(Experimental::KNotificationItem::Passive);
 
 	if (newtxt.isEmpty())
--- branches/KDE/4.3/kdeutils/kgpg/keysmanager.h #994573:994574
@@ -55,6 +55,7 @@
 class KGpgGenerateKey;
 class KGpgDelKey;
 class KGpgImport;
+class KGpgTextInterface;
 
 namespace Experimental {
 	class KNotificationItem;
@@ -210,7 +211,7 @@
     void slotDelKeyDone(int ret);
     void slotImportDone(int ret);
     void slotImportDone(KGpgImport *import, int ret);
-    void slotSetClip(const QString &newtxt);
+    void slotSetClip(const QString &newtxt, KGpgTextInterface *iface);
 
     void slotNetworkUp();
     void slotNetworkDown();


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