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-tree-sorted.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-tree-sorted.c')
| -rw-r--r-- | widgets/table/e-tree-sorted.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index 7069369a38..0e6cf3ebf9 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-tree-sorted.c * Copyright 2000, 2001, Ximian, Inc. * @@ -38,8 +38,8 @@ #include <fcntl.h> #include <string.h> -#include <gnome-xml/parser.h> -#include <gnome-xml/xmlmemory.h> +#include <libxml/parser.h> +#include <libxml/xmlmemory.h> #include <gtk/gtksignal.h> #include "gal/util/e-util.h" @@ -594,6 +594,10 @@ ets_destroy (GtkObject *object) ETreeSortedPriv *priv = ets->priv; /* FIXME lots of stuff to free here */ + if (!priv) { + GTK_OBJECT_CLASS (parent_class)->destroy (object); + return; + } if (priv->root) free_path(priv->root); @@ -653,6 +657,8 @@ ets_destroy (GtkObject *object) g_free (priv); + ets->priv = NULL; + GTK_OBJECT_CLASS (parent_class)->destroy (object); } |