diff options
| author | Jonathan Blandford <jrb@redhat.com> | 2001-07-30 05:34:55 +0000 |
|---|---|---|
| committer | Jonathan Blandford <jrb@src.gnome.org> | 2001-07-30 05:34:55 +0000 |
| commit | 09e97cbb7acee84f269bd8df0d3414362fe9241e (patch) | |
| tree | 62d6ff13affd4cf735e375bf8061742cdfc8904e /gtk | |
| parent | 2d90383caa901cf9439c30cb9a3670dd39d67731 (diff) | |
| download | gdk-pixbuf-09e97cbb7acee84f269bd8df0d3414362fe9241e.tar.gz | |
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.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtktreestore.c | 1 | ||||
| -rw-r--r-- | gtk/gtktreeview.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 46d58ccf7..598391a81 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -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)); diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 50594b51b..3f89b3f01 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -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)) |