[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=7396550

The following commit has been merged in the master branch:
commit 7396550fd4c4d0612a79de9b1ae27a557c59c28b
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Wed Aug 6 13:29:05 2014 +0200

    Fixed situation when key has to be generated for two ongoing conversations related to the same account.
    
    Signed-off-by: Marcin Ziemiński <zieminn at gmail.com>
---
 otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp b/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
index db1eb39..cda76f0 100644
--- a/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
+++ b/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
@@ -404,8 +404,7 @@ void OtrProxyChannel::Adaptee::acquirePrivateKey()
 {
     connect(ps, SIGNAL(keyGenerationFinished(const QString&, bool)), SLOT(onKeyGenerationFinished(const QString&, bool)));
     if(!ps->createNewPrivateKey(otrSes.context().accountId, otrSes.context().accountName)) {
-        disconnect(ps, SIGNAL(keyGenerationFinished(const QString&, bool)),
-                this, SLOT(onKeyGenerationFinished(const QString&, bool)));
+        kDebug() << "Probably ongoing key generation for another session";
     }
 }
 

-- 
ktp-common-internals packaging