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-selection-model.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-selection-model.c')
| -rw-r--r-- | widgets/table/e-tree-selection-model.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 4e1b626259..dc1a4610d1 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-tree-selection-model.c * Copyright 2000, 2001, Ximian, Inc. * @@ -635,15 +635,19 @@ etsm_destroy (GtkObject *object) etsm = E_TREE_SELECTION_MODEL (object); - etsm_real_clear (etsm); - etsm->priv->cursor_path = NULL; - drop_model(etsm); - drop_ets(etsm); + if (etsm->priv) { + etsm_real_clear (etsm); + etsm->priv->cursor_path = NULL; - g_free (etsm->priv->cursor_save_id); + drop_model(etsm); + drop_ets(etsm); + + g_free (etsm->priv->cursor_save_id); + etsm->priv->cursor_save_id = NULL; - g_free(etsm->priv); - etsm->priv = NULL; + g_free (etsm->priv); + etsm->priv = NULL; + } if (GTK_OBJECT_CLASS (parent_class)->destroy) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); @@ -1326,6 +1330,8 @@ e_tree_selection_model_init (ETreeSelectionModel *etsm) priv->frozen_count = 0; + priv->frozen_count = 0; + priv->tree_model_pre_change_id = 0; priv->tree_model_no_change_id = 0; @@ -1337,7 +1343,6 @@ e_tree_selection_model_init (ETreeSelectionModel *etsm) priv->tree_model_node_deleted_id = 0; priv->sorted_model_node_resorted_id = 0; - priv->selected_row = -1; priv->selected_range_end = -1; } |