diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-12-01 07:43:39 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-12-01 07:43:39 +0800 |
| commit | 0c3435a0e11086b8c9d39d87596ffe5ce7f5b133 (patch) | |
| tree | 9d361c2e57913c76cfa7f9641726a7103c79e77f /camel/camel-mime-message.c | |
| parent | ad9d11c750290405cad22ba46b0f26ed3bb73155 (diff) | |
| download | gsoc2013-evolution-0c3435a0e11086b8c9d39d87596ffe5ce7f5b133.tar.gz gsoc2013-evolution-0c3435a0e11086b8c9d39d87596ffe5ce7f5b133.tar.zst gsoc2013-evolution-0c3435a0e11086b8c9d39d87596ffe5ce7f5b133.zip | |
Don't use regex matching. Fixes bug #16227.
2001-11-29 Jeffrey Stedfast <fejj@ximian.com>
* camel-folder-search.c (search_body_contains): Don't use regex
matching. Fixes bug #16227.
* camel-mime-message.c (best_encoding): Check the content-object's
mime type, not the mime part types. Should fix bug #15843.
2001-11-27 Jeffrey Stedfast <fejj@ximian.com>
* providers/imap/camel-imap-folder.c (get_content): Return NULL if
construct_from_stream fails.
(get_message): Same.
(get_message_simple): Here too.
(add_message_from_data): And here.
svn path=/trunk/; revision=14834
Diffstat (limited to 'camel/camel-mime-message.c')
| -rw-r--r-- | camel/camel-mime-message.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c index 62d57bea70..b9655bec7c 100644 --- a/camel/camel-mime-message.c +++ b/camel/camel-mime-message.c @@ -799,12 +799,16 @@ static gboolean best_encoding (CamelMimeMessage *msg, CamelMimePart *part, void *datap) { struct _enc_data *data = datap; - char *charset; CamelMimePartEncodingType encoding; + CamelDataWrapper *wrapper; + char *charset; + + wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part)); + if (!wrapper) + return FALSE; /* we only care about actual content objects */ - if (!CAMEL_IS_MULTIPART (part) && !CAMEL_IS_MIME_MESSAGE (part)) { - + if (!CAMEL_IS_MULTIPART (wrapper) && !CAMEL_IS_MIME_MESSAGE (wrapper)) { encoding = find_best_encoding (part, data->required, data->enctype, &charset); /* we always set the encoding, if we got this far. GET_CHARSET implies also GET_ENCODING */ |