diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/em-utils.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 9cfdb92dcb..a46a285cf7 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,10 @@ 2004-03-15 Jeffrey Stedfast <fejj@ximian.com> + * em-utils.c (reply_to_message): If the mail_get_message() async + op fails, it will still call us with a NULL message to check for + that. Fixes bug #55612. + (post_reply_to_message): Same. + * em-folder-tree.c (emft_copy_folders__copy): Use camel_store_rename_folder() when appropriate (m->tostore == m->fromstore && m->delete) diff --git a/mail/em-utils.c b/mail/em-utils.c index 306bd0474c..6e79386f37 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -1213,6 +1213,9 @@ reply_to_message (CamelFolder *folder, const char *uid, CamelMimeMessage *messag guint32 flags; int mode; + if (message == NULL) + return; + mode = GPOINTER_TO_INT (user_data); account = guess_account (message, folder); @@ -1281,6 +1284,9 @@ post_reply_to_message (CamelFolder *folder, const char *uid, CamelMimeMessage *m EAccount *account; guint32 flags; + if (message == NULL) + return; + account = guess_account (message, folder); flags = CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_SEEN; |