diff options
| author | NotZed <NotZed@HelixCode.com> | 2000-05-08 13:24:54 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2000-05-08 13:24:54 +0800 |
| commit | b7f49ccf5755b1073d13348849cc71f67ba92a0d (patch) | |
| tree | e81e979778fe6b8940a42dd8860a548da1058479 /camel/camel-mime-message.c | |
| parent | 4b0541ac3358b6f094bac4f9d1f3e415e23fd4d5 (diff) | |
| download | gsoc2013-evolution-b7f49ccf5755b1073d13348849cc71f67ba92a0d.tar gsoc2013-evolution-b7f49ccf5755b1073d13348849cc71f67ba92a0d.tar.gz gsoc2013-evolution-b7f49ccf5755b1073d13348849cc71f67ba92a0d.tar.bz2 gsoc2013-evolution-b7f49ccf5755b1073d13348849cc71f67ba92a0d.tar.lz gsoc2013-evolution-b7f49ccf5755b1073d13348849cc71f67ba92a0d.tar.xz gsoc2013-evolution-b7f49ccf5755b1073d13348849cc71f67ba92a0d.tar.zst gsoc2013-evolution-b7f49ccf5755b1073d13348849cc71f67ba92a0d.zip | |
Merged NEW_SUMMARY branch back to trunk, and resolved conflicts.
2000-05-08 NotZed <NotZed@HelixCode.com>
* 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
Diffstat (limited to 'camel/camel-mime-message.c')
| -rw-r--r-- | camel/camel-mime-message.c | 11 |
1 files changed, 8 insertions, 3 deletions
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; } |