[evolution] Bug 731604 - Recursive inline-PGP-signed text not shown properly

[Milan Crha <mcrha src gnome org>]

commit 2cd604b86b271519d0b6ef511bc80b8d03e5cfa5
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jun 18 16:52:49 2014 +0200

    Bug 731604 - Recursive inline-PGP-signed text not shown properly

 em-format/e-mail-parser-inlinepgp-encrypted.c |    4 +---
 em-format/e-mail-parser-inlinepgp-signed.c    |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/em-format/e-mail-parser-inlinepgp-encrypted.c b/em-format/e-mail-parser-inlinepgp-encrypted.c
index 9bcd60d..30c4377 100644
--- a/em-format/e-mail-parser-inlinepgp-encrypted.c
+++ b/em-format/e-mail-parser-inlinepgp-encrypted.c
@@ -60,9 +60,7 @@ empe_inlinepgp_encrypted_parse (EMailParserExtension *extension,
        GList *head, *link;
        GError *local_error = NULL;
 
-       if (g_cancellable_is_cancelled (cancellable) ||
-           /* avoid recursion */
-           (part_id->str && part_id->len > 20 && g_str_has_suffix (part_id->str, ".inlinepgp_encrypted")))
+       if (g_cancellable_is_cancelled (cancellable))
                return FALSE;
 
        cipher = camel_gpg_context_new (e_mail_parser_get_session (parser));
diff --git a/em-format/e-mail-parser-inlinepgp-signed.c b/em-format/e-mail-parser-inlinepgp-signed.c
index e34928a..d8620d3 100644
--- a/em-format/e-mail-parser-inlinepgp-signed.c
+++ b/em-format/e-mail-parser-inlinepgp-signed.c
@@ -65,9 +65,7 @@ empe_inlinepgp_signed_parse (EMailParserExtension *extension,
        GError *local_error = NULL;
        GByteArray *ba;
 
-       if (g_cancellable_is_cancelled (cancellable) ||
-           /* avoid recursion */
-           (part_id->str && part_id->len > 17 && g_str_has_suffix (part_id->str, ".inlinepgp_signed")))
+       if (g_cancellable_is_cancelled (cancellable))
                return FALSE;
 
        cipher = camel_gpg_context_new (e_mail_parser_get_session (parser));