[balsa/gtk3] Restore handling of obsolete S/MIME

[Peter Bloomfield <PeterB src gnome org>]

commit c7818c7c8b2c9809e817c7fa25849634f57b1b9f
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Nov 10 20:53:01 2011 -0500

    Restore handling of obsolete S/MIME
    
    	* libbalsa/rfc3156.c (libbalsa_body_check_signature): restore
    	handling of application/x-pkcs7-signature.

 ChangeLog          |    5 +++++
 libbalsa/rfc3156.c |    6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 08f6196..12bdb8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-10  Peter Bloomfield
+
+	* libbalsa/rfc3156.c (libbalsa_body_check_signature): restore
+	handling of application/x-pkcs7-signature.
+
 2011-11-09  Peter Bloomfield
 
 	Build with GMime version >= 2.5.7
diff --git a/libbalsa/rfc3156.c b/libbalsa/rfc3156.c
index e7806d3..94b725a 100644
--- a/libbalsa/rfc3156.c
+++ b/libbalsa/rfc3156.c
@@ -646,7 +646,6 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
 	return FALSE;
     }
 
-#ifndef HAVE_GMIME_2_5_7
     /* S/MIME uses the protocol application/pkcs7-signature, but some ancient
        mailers, not yet knowing RFC 2633, use application/x-pkcs7-signature,
        so tweak the context if necessary... */
@@ -655,10 +654,13 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
 	    g_mime_object_get_content_type_parameter(GMIME_OBJECT (body->mime_part),
 						     "protocol");
 	if (!g_ascii_strcasecmp(cms_protocol, "application/x-pkcs7-signature"))
+#ifndef HAVE_GMIME_2_5_7
 	    ctx->sign_protocol = cms_protocol;
+#else /* HAVE_GMIME_2_5_7 */
+	    GMIME_GPGME_CONTEXT(ctx)->sign_protocol = cms_protocol;
+#endif /* HAVE_GMIME_2_5_7 */
     }
 
-#endif /* ! HAVE_GMIME_2_5_7 */
     /* verify the signature */
 
     libbalsa_mailbox_lock_store(body->message->mailbox);