From cffb8ea32dade7798962fd9b150c13fb793be070 Mon Sep 17 00:00:00 2001 From: Dave Camp Date: Fri, 24 May 2002 18:38:21 +0000 Subject: [PATCH] Built an iter directly instead of using 2002-05-24 Dave Camp * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_inserted): Built an iter directly instead of using gtk_tree_model_sort_elt_get_path(), since that returns a path for the child model. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtktreemodelsort.c | 8 +++++--- 7 files changed, 47 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c5df5472b..ce3da8e414 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-05-24 Dave Camp + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_inserted): + Built an iter directly instead of using + gtk_tree_model_sort_elt_get_path(), since that returns a path for + the child model. + 2002-05-24 Dave Camp * gtk/gtktreemodelsort.c: Use indices[i] >= level->array->len diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4c5df5472b..ce3da8e414 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2002-05-24 Dave Camp + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_inserted): + Built an iter directly instead of using + gtk_tree_model_sort_elt_get_path(), since that returns a path for + the child model. + 2002-05-24 Dave Camp * gtk/gtktreemodelsort.c: Use indices[i] >= level->array->len diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4c5df5472b..ce3da8e414 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2002-05-24 Dave Camp + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_inserted): + Built an iter directly instead of using + gtk_tree_model_sort_elt_get_path(), since that returns a path for + the child model. + 2002-05-24 Dave Camp * gtk/gtktreemodelsort.c: Use indices[i] >= level->array->len diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4c5df5472b..ce3da8e414 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2002-05-24 Dave Camp + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_inserted): + Built an iter directly instead of using + gtk_tree_model_sort_elt_get_path(), since that returns a path for + the child model. + 2002-05-24 Dave Camp * gtk/gtktreemodelsort.c: Use indices[i] >= level->array->len diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4c5df5472b..ce3da8e414 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2002-05-24 Dave Camp + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_inserted): + Built an iter directly instead of using + gtk_tree_model_sort_elt_get_path(), since that returns a path for + the child model. + 2002-05-24 Dave Camp * gtk/gtktreemodelsort.c: Use indices[i] >= level->array->len diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4c5df5472b..ce3da8e414 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2002-05-24 Dave Camp + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_inserted): + Built an iter directly instead of using + gtk_tree_model_sort_elt_get_path(), since that returns a path for + the child model. + 2002-05-24 Dave Camp * gtk/gtktreemodelsort.c: Use indices[i] >= level->array->len diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index a51e67c001..fa9adccbdf 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -595,11 +595,13 @@ gtk_tree_model_sort_row_inserted (GtkTreeModel *s_model, GtkTreePath *tmppath; GtkTreeIter tmpiter; - tmppath = gtk_tree_model_sort_elt_get_path (level, elt); + tmpiter.stamp = tree_model_sort->stamp; + tmpiter.user_data = level; + tmpiter.user_data2 = elt; + + tmppath = gtk_tree_model_get_path (GTK_TREE_MODEL (data), &tmpiter); if (tmppath) { - gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &tmpiter, - tmppath); gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (data), tmppath, &tmpiter);