From 026065f2fd95224568cbd893191908d75f3d4e7c Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 12 Jul 2001 16:36:19 +0000 Subject: Initialize priv->db and priv->iid so that destroy() won't crash if * e-shell.c (init): Initialize priv->db and priv->iid so that destroy() won't crash if e_shell_construct bails out before setting them. Reduces bug #4173 to #4169. svn path=/trunk/; revision=11044 --- shell/ChangeLog | 6 ++++++ shell/e-shell.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/shell/ChangeLog b/shell/ChangeLog index c81941affe..cd0c46e4c6 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2001-07-12 Dan Winship + + * e-shell.c (init): Initialize priv->db and priv->iid so that + destroy() won't crash if e_shell_construct bails out before + setting them. Reduces bug #4173 to #4169. + 2001-07-11 Iain Holmes * importers/intelligent.c (intelligent_importer_init): Sync the config diff --git a/shell/e-shell.c b/shell/e-shell.c index 47e5622971..7733752c30 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -745,6 +745,7 @@ init (EShell *shell) priv->views = NULL; + priv->iid = NULL; priv->local_directory = NULL; priv->storage_set = NULL; priv->local_storage = NULL; @@ -757,6 +758,7 @@ init (EShell *shell) priv->offline_handler = NULL; priv->crash_type_names = NULL; priv->line_status = E_SHELL_LINE_STATUS_ONLINE; + priv->db = CORBA_OBJECT_NIL; shell->priv = priv; } -- cgit