Make it work correctly when the child model is cleared completely.

Mon Mar  1 23:59:18 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted):
	Make it work correctly when the child model is cleared
	completely. (#121633)
This commit is contained in:
Matthias Clasen 2004-03-01 23:34:08 +00:00 committed by Matthias Clasen
parent 11258afd65
commit f94e21be43
6 changed files with 33 additions and 1 deletions

View File

@ -1,3 +1,9 @@
Mon Mar 1 23:59:18 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted):
Make it work correctly when the child model is cleared
completely. (#121633)
2004-03-01 Michael Natterer <mitch@gimp.org>
* gtk/gtkfilechooserwidget.h: removed accidentially committed char

View File

@ -1,3 +1,9 @@
Mon Mar 1 23:59:18 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted):
Make it work correctly when the child model is cleared
completely. (#121633)
2004-03-01 Michael Natterer <mitch@gimp.org>
* gtk/gtkfilechooserwidget.h: removed accidentially committed char

View File

@ -1,3 +1,9 @@
Mon Mar 1 23:59:18 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted):
Make it work correctly when the child model is cleared
completely. (#121633)
2004-03-01 Michael Natterer <mitch@gimp.org>
* gtk/gtkfilechooserwidget.h: removed accidentially committed char

View File

@ -1,3 +1,9 @@
Mon Mar 1 23:59:18 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted):
Make it work correctly when the child model is cleared
completely. (#121633)
2004-03-01 Michael Natterer <mitch@gimp.org>
* gtk/gtkfilechooserwidget.h: removed accidentially committed char

View File

@ -1,3 +1,9 @@
Mon Mar 1 23:59:18 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted):
Make it work correctly when the child model is cleared
completely. (#121633)
2004-03-01 Michael Natterer <mitch@gimp.org>
* gtk/gtkfilechooserwidget.h: removed accidentially committed char

View File

@ -805,12 +805,14 @@ gtk_tree_model_sort_row_deleted (GtkTreeModel *s_model,
while (elt->ref_count > 0)
gtk_tree_model_sort_real_unref_node (GTK_TREE_MODEL (data), &iter, FALSE);
if (level->ref_count == 0 && level != tree_model_sort->root)
if (level->ref_count == 0)
{
/* This will prune the level, so I can just emit the signal and not worry
* about cleaning this level up. */
gtk_tree_model_sort_increment_stamp (tree_model_sort);
gtk_tree_path_free (path);
if (level == tree_model_sort->root)
tree_model_sort->root = NULL;
return;
}