diff options
| author | Mike Kestner <mkestner@ximian.com> | 2002-08-21 06:25:14 +0800 |
|---|---|---|
| committer | Mike Kestner <mkestner@src.gnome.org> | 2002-08-21 06:25:14 +0800 |
| commit | d9b2f929a9b8a90120b970b011fe1be7fe3f8865 (patch) | |
| tree | 9c3c5f83cea2bc953ef43fcfb148dfd2b8197ffc /mail | |
| parent | ccc74517d3c44fbf38941cd99889d361864c5212 (diff) | |
| download | gsoc2013-evolution-d9b2f929a9b8a90120b970b011fe1be7fe3f8865.tar gsoc2013-evolution-d9b2f929a9b8a90120b970b011fe1be7fe3f8865.tar.gz gsoc2013-evolution-d9b2f929a9b8a90120b970b011fe1be7fe3f8865.tar.bz2 gsoc2013-evolution-d9b2f929a9b8a90120b970b011fe1be7fe3f8865.tar.lz gsoc2013-evolution-d9b2f929a9b8a90120b970b011fe1be7fe3f8865.tar.xz gsoc2013-evolution-d9b2f929a9b8a90120b970b011fe1be7fe3f8865.tar.zst gsoc2013-evolution-d9b2f929a9b8a90120b970b011fe1be7fe3f8865.zip | |
guard against the view_instance disappearing during earlier CORBA work.
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.
svn path=/trunk/; revision=17825
Diffstat (limited to 'mail')
| -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); |