Remove second call to gtk_tree_view_column_cell_set_cell_data, since we

2006-01-22  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreeview.c (gtk_tree_view_bin_expose): Remove second call
	to gtk_tree_view_column_cell_set_cell_data, since we also set the
	cell data before iterating over the columns for exposure. (Fixes
	#322471, Duncan Coutts).

diff --git a/ChangeLog b/ChangeLog
index 0db8a7c5d11d32c2f44c8fd13c6b8d05af3cf7c1..c6fdf395abe5d5650a345fef57c6e5780593609a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-22  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_bin_expose): Remove second call
+       to gtk_tree_view_column_cell_set_cell_data, since we also set the
+       cell data before iterating over the columns for exposure. (Fixes
+       #322471, Duncan Coutts).
+
 2006-01-21  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/testassistant.c: Add some tests for GtkAssistant

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0db8a7c5d11d32c2f44c8fd13c6b8d05af3cf7c1..c6fdf395abe5d5650a345fef57c6e5780593609a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2006-01-22  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_bin_expose): Remove second call
+       to gtk_tree_view_column_cell_set_cell_data, since we also set the
+       cell data before iterating over the columns for exposure. (Fixes
+       #322471, Duncan Coutts).
+
 2006-01-21  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/testassistant.c: Add some tests for GtkAssistant

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index afa17e54bd9ae9ccedd9e6fd37d39803988ae818..e448c49fd09a1f9c3a60acbe072357f1957c0529 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3693,12 +3693,6 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
              continue;
            }
 
-         gtk_tree_view_column_cell_set_cell_data (column,
-                                                  tree_view->priv->model,
-                                                  &iter,
-                                                  GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT),
-                                                  node->children?TRUE:FALSE);
-
           /* Select the detail for drawing the cell.  relevant
            * factors are parity, sortedness, and whether to
            * display rules.