diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-message-browser.c | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index d2b0db9ca8..14b58feb70 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2004-01-06 Jeffrey Stedfast <fejj@ximian.com> + + * em-message-browser.c (emmb_set_message): Protect against a NULL + message-info. Afaik, this can only happen if the message has since + been removed? Might be a larger problem here... Anyways, fixes the + crash in bug #52297. + 2004-01-05 Jeffrey Stedfast <fejj@ximian.com> * em-folder-tree-model.c (folder_renamed_cb): Clone the diff --git a/mail/em-message-browser.c b/mail/em-message-browser.c index 472ff7230c..a89d8338c5 100644 --- a/mail/em-message-browser.c +++ b/mail/em-message-browser.c @@ -174,9 +174,10 @@ emmb_set_message(EMFolderView *emfv, const char *uid) emmb_parent->set_message(emfv, uid); - info = camel_folder_get_message_info (emfv->folder, uid); - gtk_window_set_title ((GtkWindow *) emmb->window, camel_message_info_subject (info)); - camel_folder_free_message_info (emfv->folder, info); + if ((info = camel_folder_get_message_info (emfv->folder, uid))) { + gtk_window_set_title ((GtkWindow *) emmb->window, camel_message_info_subject (info)); + camel_folder_free_message_info (emfv->folder, info); + } /* Well we don't know if it got displayed (yet) ... but whatever ... */ camel_folder_set_message_flags(emfv->folder, uid, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN); |