diff --git a/ChangeLog b/ChangeLog
index fd4d5b3036..f27ec5403f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-05  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_bin_expose): in the
+	'main' expose loop, add back the calls to _set_cell_data
+	removed earlier. (#309221, Matthias Clasen).
+
 2005-07-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* demos/gtk-demo/menus.c: Demonstrate vertical menubars.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fd4d5b3036..f27ec5403f 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-07-05  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_bin_expose): in the
+	'main' expose loop, add back the calls to _set_cell_data
+	removed earlier. (#309221, Matthias Clasen).
+
 2005-07-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* demos/gtk-demo/menus.c: Demonstrate vertical menubars.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fd4d5b3036..f27ec5403f 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-07-05  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_bin_expose): in the
+	'main' expose loop, add back the calls to _set_cell_data
+	removed earlier. (#309221, Matthias Clasen).
+
 2005-07-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* demos/gtk-demo/menus.c: Demonstrate vertical menubars.
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index b3e0256beb..fdf3bf816c 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3648,6 +3648,12 @@ 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.