diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/folder-browser-ui.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index be1a0d2e48..868a556169 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2002-08-20 Mike Kestner <mkestner@ximian.com> + + * folder-browser-ui.c (folder_browser_ui_setup_view_menus): guard + against the view_instance disappearing during earlier CORBA work. + 2002-08-20 Peter Williams <peterw@ximian.com> * message-list.c (search_func): Once we hit the target node, diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c index 346b0ec188..0135872d2d 100644 --- a/mail/folder-browser-ui.c +++ b/mail/folder-browser-ui.c @@ -381,6 +381,11 @@ folder_browser_ui_setup_view_menus (FolderBrowser *fb) fb->view_menus = gal_view_menus_new (fb->view_instance); gal_view_menus_apply (fb->view_menus, fb->uicomp, NULL); + + /* Due to CORBA reentrancy, the view could be gone now. */ + if (fb->view_instance == NULL) + return; + gtk_signal_connect (GTK_OBJECT (fb->view_instance), "display_view", display_view, fb); display_view (fb->view_instance, gal_view_instance_get_current_view (fb->view_instance), fb); |