diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:37:36 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:40:49 +0800 |
| commit | cfb9c32b6657165e4d5e11aa7b47804f679a61f8 (patch) | |
| tree | 1f9c8954df7a357b5dc20a13ac82bf31c1112083 /mail/em-inline-filter.c | |
| parent | fefeb30f58447f2fa7bcbee16dbe68a9333ce89d (diff) | |
| parent | 0f7f4cfe38b3c4cd83efbe9922ae15c5aee00317 (diff) | |
| download | gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.gz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.bz2 gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.lz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.xz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.zst gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.zip | |
Merge commit 'origin/kill-bonobo'
Diffstat (limited to 'mail/em-inline-filter.c')
| -rw-r--r-- | mail/em-inline-filter.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index 1adfb52980..5daae1109b 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -32,6 +32,7 @@ #include <camel/camel-stream-mem.h> #include "em-utils.h" +#include "em-format/em-format.h" #define d(x) @@ -175,7 +176,7 @@ emif_add_part(EMInlineFilter *emif, const gchar *data, gint len) /* pre-snoop the mime type of unknown objects, and poke and hack it into place */ if (camel_content_type_is(dw->mime_type, "application", "octet-stream") - && (mimetype = em_utils_snoop_type(part)) + && (mimetype = em_format_snoop_type(part)) && strcmp(mimetype, "application/octet-stream") != 0) { camel_data_wrapper_set_mime_type(dw, mimetype); camel_mime_part_set_content_type(part, mimetype); |