diff options
| author | Not Zed <NotZed@HelixCode.com> | 2000-10-04 23:56:32 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2000-10-04 23:56:32 +0800 |
| commit | 47a2f8444fed208beaa353c9d1da69c970e91d4c (patch) | |
| tree | 9b5f06c358ccbd0bdcb8cd1fcf9b07a5aeac9a28 /camel/camel-mime-utils.c | |
| parent | 58eba683f83f3b6e2ca023c34e6eae647d929409 (diff) | |
| download | gsoc2013-evolution-47a2f8444fed208beaa353c9d1da69c970e91d4c.tar.gz gsoc2013-evolution-47a2f8444fed208beaa353c9d1da69c970e91d4c.tar.zst gsoc2013-evolution-47a2f8444fed208beaa353c9d1da69c970e91d4c.zip | |
Handle the case where ct != NULL, but type and subtype are, and also match
2000-10-04 Not Zed <NotZed@HelixCode.com>
* camel-mime-utils.c (header_content_type_is): Handle the case
where ct != NULL, but type and subtype are, and also match that
against text/plain.
* camel-folder-summary.c: Bump summary file version.
(message_info_save): Save the size from the messageinfo.
(message_info_load): Load the size from the summary file.
(message_info_load): Fixed up the time_t saving/loading. There
was a reason the warning was left there ... obviously nobody could
read the comment "/* warnings, leave them here */", why do i even
bother.
(camel_folder_summary_decode_time_t): Decode a time_t value from
the summary file.
(camel_folder_summary_encode_time_t): Encode a time_t value to the
summary file.
svn path=/trunk/; revision=5706
Diffstat (limited to 'camel/camel-mime-utils.c')
| -rw-r--r-- | camel/camel-mime-utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c index 907fc7e4fb..d7136c79f5 100644 --- a/camel/camel-mime-utils.c +++ b/camel/camel-mime-utils.c @@ -1537,7 +1537,7 @@ int header_content_type_is(struct _header_content_type *ct, const char *type, const char *subtype) { /* no type == text/plain or text/"*" */ - if (ct==NULL) { + if (ct==NULL || (ct->type == NULL && ct->subtype == NULL)) { return (!strcasecmp(type, "text") && (!strcasecmp(subtype, "plain") || !strcasecmp(subtype, "*"))); @@ -1738,12 +1738,12 @@ header_decode_mailbox(const char **in) while (pre) { char *text; + /* perform internationalised decoding, and appent */ text = header_decode_string(pre); name = g_string_append(name, text); g_free(pre); g_free(text); - /* rfc_decode(pre) */ pre = header_decode_word(&inptr); if (pre) name = g_string_append_c(name, ' '); |