From 613453b1095e325149b8d37e5731d415e1d5f9bd Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Thu, 31 Oct 2002 21:30:57 +0000 Subject: merging the gal-2 branch back to the trunk. merging the gal-2 branch back to the trunk. svn path=/trunk/; revision=18471 --- widgets/table/e-table-config-field.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'widgets/table/e-table-config-field.c') diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c index e0ae8f169c..5bcd5456a7 100644 --- a/widgets/table/e-table-config-field.c +++ b/widgets/table/e-table-config-field.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-config-field.c * Copyright 2000, 2001, Ximian, Inc. * @@ -23,7 +23,10 @@ #include #include +#include +#include #include "gal/util/e-util.h" +#include "gal/util/e-i18n.h" #include "e-table-config-field.h" #define PARENT_TYPE (gtk_vbox_get_type()) @@ -35,8 +38,13 @@ etcf_destroy (GtkObject *object) { ETableConfigField *etcf = E_TABLE_CONFIG_FIELD (object); - gtk_object_unref(GTK_OBJECT(etcf->spec)); - gtk_object_unref(GTK_OBJECT(etcf->sort_info)); + if (etct->spec) + gtk_object_unref(GTK_OBJECT(etcf->spec)); + etct->spec = NULL; + + if (etct->sort_info) + gtk_object_unref(GTK_OBJECT(etcf->sort_info)); + etct->sort_info = NULL; GTK_OBJECT_CLASS (etcf_parent_class)->destroy (object); } -- cgit v1.2.3