fix a few places where I was confused between modelsort iters and other

Thu Dec 27 16:37:04 2001  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
        (gtk_tree_model_sort_sort_level),
        (gtk_tree_model_sort_insert_value): fix a few places where
        I was confused between modelsort iters and other iters. This was
        really going to happen someday ;)

8 files changed, 70 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 8303e9e19..89c203845 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,19 @@
+Thu Dec 27 16:37:04 2001  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
+	(gtk_tree_model_sort_sort_level),
+	(gtk_tree_model_sort_insert_value): fix a few places where
+	I was confused between modelsort iters and other iters. This was
+	really going to happen someday ;)
+
 Wed Dec 26 23:41:41 2001  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): ensure
 	we are unprelighted before reordering
 
 	* gtk/gtktreemodel.c (gtk_tree_row_ref_reordered_callback): we
-	need to break out of the for loop, not return
+	need to break out of the for loop, not return (this fixed
+	the 'selection freeze' bug).
 
 	* gtk/gtktreemodelsort.c: more fixage and cleanups. It seems to
 	be pretty stable now, though it still needs some more code
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8303e9e19..89c203845 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,10 +1,19 @@
+Thu Dec 27 16:37:04 2001  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
+	(gtk_tree_model_sort_sort_level),
+	(gtk_tree_model_sort_insert_value): fix a few places where
+	I was confused between modelsort iters and other iters. This was
+	really going to happen someday ;)
+
 Wed Dec 26 23:41:41 2001  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): ensure
 	we are unprelighted before reordering
 
 	* gtk/gtktreemodel.c (gtk_tree_row_ref_reordered_callback): we
-	need to break out of the for loop, not return
+	need to break out of the for loop, not return (this fixed
+	the 'selection freeze' bug).
 
 	* gtk/gtktreemodelsort.c: more fixage and cleanups. It seems to
 	be pretty stable now, though it still needs some more code
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8303e9e19..89c203845 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,10 +1,19 @@
+Thu Dec 27 16:37:04 2001  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
+	(gtk_tree_model_sort_sort_level),
+	(gtk_tree_model_sort_insert_value): fix a few places where
+	I was confused between modelsort iters and other iters. This was
+	really going to happen someday ;)
+
 Wed Dec 26 23:41:41 2001  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): ensure
 	we are unprelighted before reordering
 
 	* gtk/gtktreemodel.c (gtk_tree_row_ref_reordered_callback): we
-	need to break out of the for loop, not return
+	need to break out of the for loop, not return (this fixed
+	the 'selection freeze' bug).
 
 	* gtk/gtktreemodelsort.c: more fixage and cleanups. It seems to
 	be pretty stable now, though it still needs some more code
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8303e9e19..89c203845 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,10 +1,19 @@
+Thu Dec 27 16:37:04 2001  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
+	(gtk_tree_model_sort_sort_level),
+	(gtk_tree_model_sort_insert_value): fix a few places where
+	I was confused between modelsort iters and other iters. This was
+	really going to happen someday ;)
+
 Wed Dec 26 23:41:41 2001  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): ensure
 	we are unprelighted before reordering
 
 	* gtk/gtktreemodel.c (gtk_tree_row_ref_reordered_callback): we
-	need to break out of the for loop, not return
+	need to break out of the for loop, not return (this fixed
+	the 'selection freeze' bug).
 
 	* gtk/gtktreemodelsort.c: more fixage and cleanups. It seems to
 	be pretty stable now, though it still needs some more code
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8303e9e19..89c203845 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,10 +1,19 @@
+Thu Dec 27 16:37:04 2001  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
+	(gtk_tree_model_sort_sort_level),
+	(gtk_tree_model_sort_insert_value): fix a few places where
+	I was confused between modelsort iters and other iters. This was
+	really going to happen someday ;)
+
 Wed Dec 26 23:41:41 2001  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): ensure
 	we are unprelighted before reordering
 
 	* gtk/gtktreemodel.c (gtk_tree_row_ref_reordered_callback): we
-	need to break out of the for loop, not return
+	need to break out of the for loop, not return (this fixed
+	the 'selection freeze' bug).
 
 	* gtk/gtktreemodelsort.c: more fixage and cleanups. It seems to
 	be pretty stable now, though it still needs some more code
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8303e9e19..89c203845 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,10 +1,19 @@
+Thu Dec 27 16:37:04 2001  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
+	(gtk_tree_model_sort_sort_level),
+	(gtk_tree_model_sort_insert_value): fix a few places where
+	I was confused between modelsort iters and other iters. This was
+	really going to happen someday ;)
+
 Wed Dec 26 23:41:41 2001  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): ensure
 	we are unprelighted before reordering
 
 	* gtk/gtktreemodel.c (gtk_tree_row_ref_reordered_callback): we
-	need to break out of the for loop, not return
+	need to break out of the for loop, not return (this fixed
+	the 'selection freeze' bug).
 
 	* gtk/gtktreemodelsort.c: more fixage and cleanups. It seems to
 	be pretty stable now, though it still needs some more code
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8303e9e19..89c203845 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,10 +1,19 @@
+Thu Dec 27 16:37:04 2001  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
+	(gtk_tree_model_sort_sort_level),
+	(gtk_tree_model_sort_insert_value): fix a few places where
+	I was confused between modelsort iters and other iters. This was
+	really going to happen someday ;)
+
 Wed Dec 26 23:41:41 2001  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): ensure
 	we are unprelighted before reordering
 
 	* gtk/gtktreemodel.c (gtk_tree_row_ref_reordered_callback): we
-	need to break out of the for loop, not return
+	need to break out of the for loop, not return (this fixed
+	the 'selection freeze' bug).
 
 	* gtk/gtktreemodelsort.c: more fixage and cleanups. It seems to
 	be pretty stable now, though it still needs some more code
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index f8e2c3a25..291c493bd 100644
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -740,8 +740,6 @@ gtk_tree_model_sort_row_deleted (GtkTreeModel *s_model,
 	elt->offset--;
       if (elt->children)
 	elt->children->parent_elt = elt;
-      if (GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
-	elt->iter.user_data2 = elt;
     }
 
   gtk_tree_path_free (path);
@@ -1499,8 +1497,6 @@ gtk_tree_model_sort_sort_level (GtkTreeModelSort *tree_model_sort,
       elt = &g_array_index (new_array, SortElt, i);
       if (elt->children)
 	elt->children->parent_elt = elt;
-      if (GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
-	elt->iter.user_data2 = elt;
     }
 
   g_array_free (level->array, TRUE);
@@ -1674,8 +1670,6 @@ gtk_tree_model_sort_insert_value (GtkTreeModelSort *tree_model_sort,
 	tmp_elt->offset++;
       if (tmp_elt->children)
 	tmp_elt->children->parent_elt = tmp_elt;
-      if (GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
-	tmp_elt->iter.user_data2 = tmp_elt;
     }