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-table-adapter.c | |
| parent | ec242d6c30d7bf056c8f59710b8576c942f93583 (diff) | |
| download | gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.gz 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-table-adapter.c')
| -rw-r--r-- | widgets/table/e-tree-table-adapter.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index 92c33668de..201e121369 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-tree-table-adapter.c * Copyright 2000, 2001, Ximian, Inc. * @@ -31,8 +31,8 @@ #include <string.h> #include <gtk/gtksignal.h> -#include <gnome-xml/tree.h> -#include <gnome-xml/parser.h> +#include <libxml/tree.h> +#include <libxml/parser.h> #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" #include "e-tree-table-adapter.h" @@ -405,6 +405,11 @@ etta_destroy (GtkObject *object) { ETreeTableAdapter *etta = E_TREE_TABLE_ADAPTER (object); + if (!etta->priv) { + GTK_OBJECT_CLASS (parent_class)->destroy (object); + return; + } + if (etta->priv->source && e_tree_model_has_save_id(etta->priv->source)) { g_hash_table_foreach(etta->priv->attributes, free_string, NULL); } @@ -444,6 +449,7 @@ etta_destroy (GtkObject *object) g_free (etta->priv->map_table); g_free (etta->priv); + etta->priv = NULL; GTK_OBJECT_CLASS (parent_class)->destroy (object); } @@ -961,7 +967,7 @@ e_tree_table_adapter_save_expanded_state (ETreeTableAdapter *etta, const char *f save_expanded_state_func, &tar); - e_xml_save_file (filename, doc); + xmlSaveFile (filename, doc); xmlFreeDoc (doc); } @@ -1006,6 +1012,8 @@ e_tree_table_adapter_load_expanded_state (ETreeTableAdapter *etta, const char *f e_table_model_pre_change(E_TABLE_MODEL(etta)); + e_table_model_pre_change(E_TABLE_MODEL(etta)); + for (child = root->xmlChildrenNode; child; child = child->next) { char *id; |