diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/folder-browser-ui.c | 1 | ||||
| -rw-r--r-- | mail/folder-browser.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 44e9950ffb..a87563af79 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2002-05-01 Not Zed <NotZed@Ximian.com> + + * folder-browser.h (FOLDER_BROWSER_IS_DESTROYED): Also check + folder!=NULL. Fixes race where folder isn't setup yet, and + neither is bonobo menu status (because its delayed), and we get a + menu event before we're setup yet. For bug #21939. + 2002-04-30 Dan Winship <danw@ximian.com> * mail-callbacks.c (delete_msg): If the folder's permanent_flags diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c index e2638d79a1..577192cf71 100644 --- a/mail/folder-browser-ui.c +++ b/mail/folder-browser-ui.c @@ -644,7 +644,6 @@ folder_browser_ui_set_selection_state (FolderBrowser *fb, FolderBrowserSelection NULL }; - fbui_sensitize_items (fb, message_pane_enables, state != FB_SELSTATE_NONE && fb->loaded_uid && fb->preview_shown); /* assumes that all the appropriate XML's have been loaded */ diff --git a/mail/folder-browser.h b/mail/folder-browser.h index 464f1414f6..349dbb987b 100644 --- a/mail/folder-browser.h +++ b/mail/folder-browser.h @@ -25,7 +25,7 @@ #define FB_DEFAULT_CHARSET _("Default") -#define FOLDER_BROWSER_IS_DESTROYED(fb) (!fb || !fb->message_list || !fb->mail_display) +#define FOLDER_BROWSER_IS_DESTROYED(fb) (!fb || !fb->message_list || !fb->mail_display || !fb->folder) typedef enum _FolderBrowserSelectionState { FB_SELSTATE_NONE, |