Fix retriggering of GPGMe socket notifiers in nested event loops

This resolves Bug 825
Add missing GPGMe feature checks to CMake

1 files changed, 4 insertions, 3 deletions

diff --git a/libtdenetwork/gpgmepp/callbacks.cpp b/libtdenetwork/gpgmepp/callbacks.cpp
index ba9c30bf0..23cc55e82 100644
--- a/libtdenetwork/gpgmepp/callbacks.cpp
+++ b/libtdenetwork/gpgmepp/callbacks.cpp
@@ -64,9 +64,10 @@ gpgme_error_t passphrase_callback( void * opaque, const char * uid_hint, const c
   bool canceled = false;
   gpgme_error_t err = GPG_ERR_NO_ERROR;
   char * passphrase = provider ? provider->getPassphrase( uid_hint, desc, prev_was_bad, canceled ) : 0 ;
-  if ( canceled )
+  if ( canceled ) {
     err = makeError( GPG_ERR_CANCELED );
-  else
+  }
+  else {
     if ( passphrase && *passphrase ) {
       size_t passphrase_length = strlen( passphrase );
       size_t written = 0;
@@ -79,7 +80,7 @@ gpgme_error_t passphrase_callback( void * opaque, const char * uid_hint, const c
 	written += now_written;
       } while ( written < passphrase_length );
     }
-  
+  }
   if ( passphrase && *passphrase )
     wipe( passphrase, strlen( passphrase ) );
   free( passphrase );