From b7f49ccf5755b1073d13348849cc71f67ba92a0d Mon Sep 17 00:00:00 2001 From: NotZed Date: Mon, 8 May 2000 05:24:54 +0000 Subject: Merged NEW_SUMMARY branch back to trunk, and resolved conflicts. 2000-05-08 NotZed * Merged NEW_SUMMARY branch back to trunk, and resolved conflicts. * providers/mbox/camel-mbox-summary.c (camel_mbox_summary_update): Return status. * camel-stream-filter.c (do_close): We NEED a stream close. svn path=/trunk/; revision=2906 --- camel/camel-mime-message.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'camel/camel-mime-message.c') diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c index db42a3e599..d6fdc2c0a6 100644 --- a/camel/camel-mime-message.c +++ b/camel/camel-mime-message.c @@ -463,7 +463,7 @@ camel_mime_message_set_user_flag (CamelMimeMessage *m, const char *name, gboolea char *oldname; gboolean oldvalue; - there = g_hash_table_lookup_extended(m->user_flags, name, &oldname, &oldvalue); + there = g_hash_table_lookup_extended(m->user_flags, name, (void *)&oldname, (void *)&oldvalue); if (value && !there) { g_hash_table_insert(m->user_flags, g_strdup(name), (void *)TRUE); @@ -519,8 +519,13 @@ construct_from_parser(CamelMimePart *dw, CamelMimeParser *mp) /* ... then clean up the follow-on state */ state = camel_mime_parser_step(mp, &buf, &len); - if (!(state == HSCAN_MESSAGE_END || state == HSCAN_EOF)) { - g_error("Bad parser state: Expecing MESSAGE_END or EOF, got: %d", camel_mime_parser_state(mp)); + switch (state) { + case HSCAN_EOF: case HSCAN_FROM_END: /* this doesn't belong to us */ + camel_mime_parser_unstep(mp); + case HSCAN_MESSAGE_END: + break; + default: + g_error("Bad parser state: Expecing MESSAGE_END or EOF or ROM, got: %d", camel_mime_parser_state(mp)); camel_mime_parser_unstep(mp); return -1; } -- cgit v1.2.3