diff options
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/folder-browser-ui.c | 4 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 751f50c53a..3ccb9933bf 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,13 @@ 2002-09-09 Jeffrey Stedfast <fejj@ximian.com> + * folder-browser-ui.c (folder_browser_ui_scan_selection): Make + sure that fb->message_list is non-NULL before checking + fb->message_list->threaded? I guess this'll fix bug #29965. + + * mail-callbacks.c (composer_save_draft_cb): NULL-check the ccd + before reffing it. + (composer_send_cb): Same. + * upgrade-mailer.c (shortcuts_upgrade_xml_file): Don't look for an end quote, instead look for </item> to terminate the uri. (shortcuts_upgrade_uri): Hex decode the imap folder name after diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c index f7d2fc8da0..86b3b0fe35 100644 --- a/mail/folder-browser-ui.c +++ b/mail/folder-browser-ui.c @@ -715,8 +715,8 @@ folder_browser_ui_scan_selection (FolderBrowser *fb) enable_mask |= IS_SENT_FOLDER; outgoing = TRUE; } - - if (fb->message_list->threaded) + + if (fb->message_list && fb->message_list->threaded) enable_mask |= IS_THREADED; else enable_mask |= NOT_THREADED; diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 359741d6eb..fc5c0f892c 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -640,7 +640,8 @@ composer_send_cb (EMsgComposer *composer, gpointer user_data) send = g_malloc (sizeof (*send)); send->ccd = user_data; - ccd_ref (send->ccd); + if (send->ccd) + ccd_ref (send->ccd); send->send = !post; send->composer = composer; gtk_object_ref (GTK_OBJECT (composer)); @@ -794,7 +795,8 @@ composer_save_draft_cb (EMsgComposer *composer, int quit, gpointer user_data) sdi->composer = composer; gtk_object_ref (GTK_OBJECT (composer)); sdi->ccd = user_data; - ccd_ref (sdi->ccd); + if (sdi->ccd) + ccd_ref (sdi->ccd); sdi->quit = quit; mail_append_mail (folder, msg, info, save_draft_done, sdi); |