Fix retriggering of GPGMe socket notifiers in nested event loops

This resolves Bug 825
Add missing GPGMe feature checks to CMake

1 files changed, 15 insertions, 0 deletions

diff --git a/libtdenetwork/qgpgme/eventloopinteractor.cpp b/libtdenetwork/qgpgme/eventloopinteractor.cpp
index 3b07189d..b6d9830d 100644
--- a/libtdenetwork/qgpgme/eventloopinteractor.cpp
+++ b/libtdenetwork/qgpgme/eventloopinteractor.cpp
@@ -30,6 +30,11 @@
 #include <tqsocketnotifier.h>
 #include <tqapplication.h>
 
+#include <tqvaluelist.h>
+
+TQValueList<int> writeActivity;
+TQValueList<int> readActivity;
+
 using namespace GpgME;
 
 QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * parent, const char * name )
@@ -77,11 +82,21 @@ void QGpgME::EventLoopInteractor::unregisterWatcher( void * tag ) {
 }
 
 void QGpgME::EventLoopInteractor::slotWriteActivity( int socket ) {
+  if (writeActivity.contains(socket)) {
+    return;
+  }
+  writeActivity.append(socket);
   actOn( socket , Write );
+  writeActivity.remove(socket);
 }
 
 void QGpgME::EventLoopInteractor::slotReadActivity( int socket ) {
+  if (readActivity.contains(socket)) {
+    return;
+  }
+  readActivity.append(socket);
   actOn( socket , Read );
+  readActivity.remove(socket);
 }
 
 void QGpgME::EventLoopInteractor::nextTrustItemEvent( GpgME::Context * context, const GpgME::TrustItem & item ) {