don't bother inserting new rows in a level with a zero refcount and

2005-08-23  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_inserted): don't
	bother inserting new rows in a level with a zero refcount and
	immediately free the level. (Fixes #312350, reported by Markku Vire).

diff --git a/ChangeLog b/ChangeLog
index 929e92f4ba56eaa0acc70ba84bedf0fafb955bba..2581077c91a9cc35572e85ee658283dc078f4fad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-23  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_inserted): don't
+       bother inserting new rows in a level with a zero refcount and
+       immediately free the level. (Fixes #312350, reported by Markku Vire).
+
 2005-08-23  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/updateiconcache.c: Complain when there is no index.theme file

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 929e92f4ba56eaa0acc70ba84bedf0fafb955bba..2581077c91a9cc35572e85ee658283dc078f4fad 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-08-23  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_inserted): don't
+       bother inserting new rows in a level with a zero refcount and
+       immediately free the level. (Fixes #312350, reported by Markku Vire).
+
 2005-08-23  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/updateiconcache.c: Complain when there is no index.theme file

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 929e92f4ba56eaa0acc70ba84bedf0fafb955bba..2581077c91a9cc35572e85ee658283dc078f4fad 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-08-23  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_inserted): don't
+       bother inserting new rows in a level with a zero refcount and
+       immediately free the level. (Fixes #312350, reported by Markku Vire).
+
 2005-08-23  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/updateiconcache.c: Complain when there is no index.theme file

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 47b42b66b16506f66457c7a3f697bd80346d3fbb..ed1579421708433a6d068366729c1fdac6940993 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -728,6 +728,12 @@ gtk_tree_model_sort_row_inserted (GtkTreeModel          *s_model,
   if (!parent_level)
     goto done;
 
+  if (level->ref_count == 0 && level != tree_model_sort->root)
+    {
+      gtk_tree_model_sort_free_level (tree_model_sort, level);
+      goto done;
+    }
+
   if (!gtk_tree_model_sort_insert_value (tree_model_sort,
                                         parent_level,
                                         s_path,