From ad3fd1d471c7cc32de1e6a2697e04a9276165a2c Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Fri, 21 Jul 2000 09:13:35 +0000 Subject: Prevent a crash by avoiding calling the populate_folder_context_menu function when NULL. (Ooops, I forgot this.) svn path=/trunk/; revision=4253 --- shell/ChangeLog | 7 +++++++ shell/evolution-shell-component.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/shell/ChangeLog b/shell/ChangeLog index 0f57b511f2..77bf3e66dd 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2000-07-21 Ettore Perazzoli + + * evolution-shell-component.c + (impl_ShellComponent_populate_folder_context_menu): If the pointer + to the function to populate the folder context menu is NULL, don't + do anything. + 2000-07-21 Ettore Perazzoli * e-storage-set-view.c (popup_folder_menu): New. Create a diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c index c3560b2776..e5d2d9edda 100644 --- a/shell/evolution-shell-component.c +++ b/shell/evolution-shell-component.c @@ -280,6 +280,9 @@ impl_ShellComponent_populate_folder_context_menu (PortableServer_Servant servant shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object); priv = shell_component->priv; + if (priv->populate_folder_context_menu_fn == NULL) + return; + uih = bonobo_ui_handler_new (); bonobo_ui_handler_set_container (uih, corba_uih); -- cgit v1.2.3