diff options
-rw-r--r-- | mail/ChangeLog | 8 | ||||
-rw-r--r-- | mail/folder-browser.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 467616f0f4..198564db72 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2003-06-23 Larry Ewing <lewing@ximian.com> + + * folder-browser.c (do_message_selected): make sure not to strcmp + a possibly NULL string. + 2003-06-19 Not Zed <NotZed@Ximian.com> ** See bug #45063 @@ -56,6 +61,9 @@ 2003-06-11 Larry Ewing <lewing@ximian.com> + * mail-format.c (mail_lookup_handler): free the application list + if we are bailing. + * mail-send-recv.c (free_folder_info): free the info structure as well. diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 0f09f8b7fd..b2b9f2f2f3 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -2473,7 +2473,7 @@ do_message_selected (FolderBrowser *fb) /* if we are loading, then set a pending, but leave the loading, coudl cancel here (?) */ if (fb->loading_uid) { - if (fb->new_uid == NULL || strcmp(fb->pending_uid, fb->new_uid) != 0) { + if (fb->new_uid == NULL || fb->pending_uid == NULL || strcmp(fb->pending_uid, fb->new_uid) != 0) { g_free (fb->pending_uid); fb->pending_uid = g_strdup (fb->new_uid); } |