[gmime] Revert previous commit (didn't work)



commit 74fc419284e6119cdfd7c438e8ce6988dacd4d99
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Fri Mar 10 15:43:37 2017 -0500

    Revert previous commit (didn't work)

 gmime/gmime-gpgme-utils.c |    2 +-
 tests/test-pgpmime.c      |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gmime/gmime-gpgme-utils.c b/gmime/gmime-gpgme-utils.c
index 64a9afb..20f7005 100644
--- a/gmime/gmime-gpgme-utils.c
+++ b/gmime/gmime-gpgme-utils.c
@@ -547,7 +547,7 @@ g_mime_gpgme_decrypt (gpgme_ctx_t ctx, GMimeDecryptFlags flags, const char *sess
 #endif
        
        /* decrypt the input stream */
-       if (gpgme_get_protocol (ctx) == GPGME_PROTOCOL_OpenPGP && gpgme_check_version ("1.7.0"))
+       if (gpgme_get_protocol (ctx) == GPGME_PROTOCOL_OpenPGP)
                error = gpgme_op_decrypt_verify (ctx, input, output);
        else
                error = gpgme_op_decrypt (ctx, input, output);
diff --git a/tests/test-pgpmime.c b/tests/test-pgpmime.c
index 3911492..567c2cf 100644
--- a/tests/test-pgpmime.c
+++ b/tests/test-pgpmime.c
@@ -335,6 +335,7 @@ test_multipart_encrypted (GMimeCryptoContext *ctx, gboolean sign,
        
        g_mime_stream_reset (stream);
        g_mime_stream_reset (cleartext);
+       
        parser = g_mime_parser_new ();
        g_mime_parser_init_with_stream (parser, stream);
        


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]