From 03c22238641a72e40cc853627ce9ad685b358373 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Fri, 4 Apr 2003 19:21:50 +0000 Subject: guard against multiple destroy calls 2003-04-04 JP Rosevear * gui/cal-search-bar.c (cal_search_bar_destroy): guard against multiple destroy calls svn path=/trunk/; revision=20672 --- calendar/gui/cal-search-bar.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'calendar/gui/cal-search-bar.c') diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c index e5c64aaa72..d04cbcb492 100644 --- a/calendar/gui/cal-search-bar.c +++ b/calendar/gui/cal-search-bar.c @@ -167,14 +167,16 @@ cal_search_bar_destroy (GtkObject *object) cal_search = CAL_SEARCH_BAR (object); priv = cal_search->priv; - if (priv->categories) { - free_categories (priv->categories); - priv->categories = NULL; + if (priv) { + if (priv->categories) { + free_categories (priv->categories); + priv->categories = NULL; + } + + g_free (priv); + cal_search->priv = NULL; } - - g_free (priv); - cal_search->priv = NULL; - + if (GTK_OBJECT_CLASS (parent_class)->destroy) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } -- cgit v1.2.3