diff options
author | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
---|---|---|
committer | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
commit | 613453b1095e325149b8d37e5731d415e1d5f9bd (patch) | |
tree | 1c0d7f9be4d4a87aa67d8e185ae2bb23d02254b7 /widgets/table/e-table-config-field.c | |
parent | ec242d6c30d7bf056c8f59710b8576c942f93583 (diff) | |
download | gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.gz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.bz2 gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.lz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.xz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.zst gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.zip |
merging the gal-2 branch back to the trunk.
merging the gal-2 branch back to the trunk.
svn path=/trunk/; revision=18471
Diffstat (limited to 'widgets/table/e-table-config-field.c')
-rw-r--r-- | widgets/table/e-table-config-field.c | 14 |
1 files changed, 11 insertions, 3 deletions
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 <config.h> #include <stdlib.h> +#include <gtk/gtk.h> +#include <gtk/gtkbox.h> #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); } |