diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2000-07-21 17:13:35 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2000-07-21 17:13:35 +0800 |
| commit | ad3fd1d471c7cc32de1e6a2697e04a9276165a2c (patch) | |
| tree | bd0769c8bc30312be8ddd8a1ed56e4c0c86f7f0a | |
| parent | 7d6ff2410ae4d929a345fa3fbc16349819f74f5c (diff) | |
| download | gsoc2013-evolution-ad3fd1d471c7cc32de1e6a2697e04a9276165a2c.tar gsoc2013-evolution-ad3fd1d471c7cc32de1e6a2697e04a9276165a2c.tar.gz gsoc2013-evolution-ad3fd1d471c7cc32de1e6a2697e04a9276165a2c.tar.bz2 gsoc2013-evolution-ad3fd1d471c7cc32de1e6a2697e04a9276165a2c.tar.lz gsoc2013-evolution-ad3fd1d471c7cc32de1e6a2697e04a9276165a2c.tar.xz gsoc2013-evolution-ad3fd1d471c7cc32de1e6a2697e04a9276165a2c.tar.zst gsoc2013-evolution-ad3fd1d471c7cc32de1e6a2697e04a9276165a2c.zip | |
Prevent a crash by avoiding calling the populate_folder_context_menu
function when NULL. (Ooops, I forgot this.)
svn path=/trunk/; revision=4253
| -rw-r--r-- | shell/ChangeLog | 7 | ||||
| -rw-r--r-- | shell/evolution-shell-component.c | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 0f57b511f2..77bf3e66dd 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,12 @@ 2000-07-21 Ettore Perazzoli <ettore@helixcode.com> + * 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 <ettore@helixcode.com> + * e-storage-set-view.c (popup_folder_menu): New. Create a BonoboUIHandler-managed pop-up menu, let the component fill it in with `::populate_folder_context_menu', and display it. Then 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); |