diff options
| author | Not Zed <NotZed@Ximian.com> | 2005-04-06 13:39:08 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2005-04-06 13:39:08 +0800 |
| commit | 9562db3ab0d93d6bc591caa5f5e8624a120544f7 (patch) | |
| tree | 5057fcc9a45e130089e7a6611e9584e56fae787c /mail | |
| parent | 80b62f525c6cbcb5a35b33b5daf9fe9bfcae38d1 (diff) | |
| download | gsoc2013-evolution-9562db3ab0d93d6bc591caa5f5e8624a120544f7.tar gsoc2013-evolution-9562db3ab0d93d6bc591caa5f5e8624a120544f7.tar.gz gsoc2013-evolution-9562db3ab0d93d6bc591caa5f5e8624a120544f7.tar.bz2 gsoc2013-evolution-9562db3ab0d93d6bc591caa5f5e8624a120544f7.tar.lz gsoc2013-evolution-9562db3ab0d93d6bc591caa5f5e8624a120544f7.tar.xz gsoc2013-evolution-9562db3ab0d93d6bc591caa5f5e8624a120544f7.tar.zst gsoc2013-evolution-9562db3ab0d93d6bc591caa5f5e8624a120544f7.zip | |
** See bug #74320
2005-04-05 Not Zed <NotZed@Ximian.com>
** 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
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-format.c | 5 |
2 files changed, 11 insertions, 1 deletions
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 <NotZed@Ximian.com> + + ** 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 <dobey@novell.com> * 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) |