From 4b74a42adf77437cebda06977077664dc66cdf8c Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Tue, 4 Dec 2001 12:11:16 +0000 Subject: Merging changes: 2001-11-28 Christopher James Lahey * e-table.c (context_destroyed), e-tree.c (context_destroyed): Check for et being destroyed here before doing anything. Fixes Ximian bug #15728. svn path=/trunk/; revision=14864 --- widgets/table/e-tree.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'widgets/table/e-tree.c') diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 300644f750..3e15e1db94 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -2375,12 +2375,14 @@ static void context_destroyed (gpointer data) { ETree *et = data; - et->priv->last_drop_x = 0; - et->priv->last_drop_y = 0; - et->priv->last_drop_time = 0; - et->priv->last_drop_context = NULL; - scroll_off (et); - hover_off (et); + if (et->priv) { + et->priv->last_drop_x = 0; + et->priv->last_drop_y = 0; + et->priv->last_drop_time = 0; + et->priv->last_drop_context = NULL; + scroll_off (et); + hover_off (et); + } gtk_object_unref (GTK_OBJECT (et)); } -- cgit v1.2.3