aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2001-07-13 00:36:19 +0800
committerDan Winship <danw@src.gnome.org>2001-07-13 00:36:19 +0800
commit026065f2fd95224568cbd893191908d75f3d4e7c (patch)
tree89fc8013d1793da3eca6f3cb25f287c61b6367cd
parent91ab110ec61eaaa0cabc0dd8ec3b45a143cac122 (diff)
downloadgsoc2013-evolution-026065f2fd95224568cbd893191908d75f3d4e7c.tar
gsoc2013-evolution-026065f2fd95224568cbd893191908d75f3d4e7c.tar.gz
gsoc2013-evolution-026065f2fd95224568cbd893191908d75f3d4e7c.tar.bz2
gsoc2013-evolution-026065f2fd95224568cbd893191908d75f3d4e7c.tar.lz
gsoc2013-evolution-026065f2fd95224568cbd893191908d75f3d4e7c.tar.xz
gsoc2013-evolution-026065f2fd95224568cbd893191908d75f3d4e7c.tar.zst
gsoc2013-evolution-026065f2fd95224568cbd893191908d75f3d4e7c.zip
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
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-shell.c2
2 files changed, 8 insertions, 0 deletions
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 <danw@ximian.com>
+
+ * 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 <iain@ximian.com>
* 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;
}