From 9562db3ab0d93d6bc591caa5f5e8624a120544f7 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 6 Apr 2005 05:39:08 +0000 Subject: ** See bug #74320 2005-04-05 Not Zed ** See bug #74320 * em-format.c (em_format_part_as): if the snooped type is NULL, fall back to application/octet-stream. svn path=/trunk/; revision=29161 --- mail/ChangeLog | 7 +++++++ mail/em-format.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 9bd6f0c85a..c06c0409db 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2005-04-05 Not Zed + + ** See bug #74320 + + * em-format.c (em_format_part_as): if the snooped type is NULL, + fall back to application/octet-stream. + 2005-04-04 Rodney Dawes * em-folder-view.c (emfv_popup_items): Add Mark as Read/Unread back diff --git a/mail/em-format.c b/mail/em-format.c index e331a03493..aef5bc0ebe 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -568,8 +568,11 @@ em_format_part_as(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const g_free(basestr); if (mime_type != NULL) { - if (g_ascii_strcasecmp(mime_type, "application/octet-stream") == 0) + if (g_ascii_strcasecmp(mime_type, "application/octet-stream") == 0) { emf->snoop_mime_type = mime_type = em_utils_snoop_type(part); + if (mime_type == NULL) + mime_type = "application/octet-stream"; + } handle = em_format_find_handler(emf, mime_type); if (handle == NULL) -- cgit v1.2.3