Fix part of #57714.

Mon Jul 30 01:16:02 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix part of
	#57714.
This commit is contained in:
Jonathan Blandford 2001-07-30 05:34:55 +00:00 committed by Jonathan Blandford
parent 2d90383caa
commit 09e97cbb7a
2 changed files with 6 additions and 1 deletions

View File

@ -1097,6 +1097,7 @@ gtk_tree_store_append (GtkTreeStore *model,
g_return_if_fail (GTK_IS_TREE_STORE (model));
g_return_if_fail (iter != NULL);
if (parent != NULL)
g_return_if_fail (VALID_ITER (parent, model));

View File

@ -7335,10 +7335,14 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
if (tree_view->priv->destroy_count_func)
{
GtkTreePath *child_path;
gint child_count = 0;
child_path = gtk_tree_path_copy (path);
gtk_tree_path_append_index (child_path, 0);
if (node->children)
_gtk_rbtree_traverse (node->children, node->children->root, G_POST_ORDER, count_children_helper, &child_count);
(* tree_view->priv->destroy_count_func) (tree_view, path, child_count, tree_view->priv->destroy_count_data);
(* tree_view->priv->destroy_count_func) (tree_view, child_path, child_count, tree_view->priv->destroy_count_data);
gtk_tree_path_free (child_path);
}
if (gtk_tree_view_unref_and_check_selection_tree (tree_view, node->children))