aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog12
-rw-r--r--mail/em-format-html-display.c2
-rw-r--r--mail/em-format-html.c1
-rw-r--r--mail/em-format.c1
4 files changed, 16 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 44401b4a4a..454477cfe6 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,15 @@
+2003-12-12 Not Zed <NotZed@Ximian.com>
+
+ ** See bug #52108.
+
+ * em-format.c (em_format_is_attachment): also recognise
+ application/pkcs7-mime for mailers who like to make up their own
+ standards.
+
+ * em-format-html.c (type_builtin_table[]): *
+ em-format-html-display.c (type_builtin_table[]): make recognise
+ application/pkcs7-mime too.
+
2003-12-11 Chris Toshok <toshok@ximian.com>
* Makefile.am (INCLUDES): get the build moving again. add
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 242595eb5d..e21373cc51 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -913,6 +913,8 @@ efhd_multipart_signed (EMFormat *emf, CamelStream *stream, CamelMimePart *part,
static EMFormatHandler type_builtin_table[] = {
{ "application/x-pkcs7-mime", (EMFormatFunc)efhd_application_xpkcs7mime },
+ { "application/pkcs7-mime", (EMFormatFunc)efhd_application_xpkcs7mime },
+
{ "multipart/signed", (EMFormatFunc)efhd_multipart_signed },
};
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index c3aa74440d..b1f380c78e 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1091,6 +1091,7 @@ efh_image(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormatH
static EMFormatHandler type_builtin_table[] = {
{ "application/x-pkcs7-mime", (EMFormatFunc)efh_application_xpkcs7mime },
+ { "application/pkcs7-mime", (EMFormatFunc)efh_application_xpkcs7mime },
{ "image/gif", (EMFormatFunc)efh_image },
{ "image/jpeg", (EMFormatFunc)efh_image },
diff --git a/mail/em-format.c b/mail/em-format.c
index 29e55d3cc5..b3f9b9a344 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -743,6 +743,7 @@ int em_format_is_attachment(EMFormat *emf, CamelMimePart *part)
/*printf("checking is attachment %s/%s\n", ct->type, ct->subtype);*/
return !(camel_content_type_is (dw->mime_type, "multipart", "*")
|| camel_content_type_is(dw->mime_type, "application", "x-pkcs7-mime")
+ || camel_content_type_is(dw->mime_type, "application", "pkcs7-mime")
|| (camel_content_type_is (dw->mime_type, "text", "*")
&& camel_mime_part_get_filename(part) == NULL));
}