Avoid recursive calls to gtk_tree_view_top_row_to_dy()

Commit 3f306a40422e367ef03b9e6f6c80dec9fc932602 made it possible for
gtk_tree_view_top_row_to_dy() to be called recursively.  (In a different
way than was already guarded for).  This caused a single test case in
the scrolling test suite to fail.  We now also guard for recursive calls at
the beginning of gtk_tree_view_top_row_to_dy().

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 665720fe5518f452bb937723decb3816ba75ddbf..a0fdf330727050db21deee4795aceac43abd6b5d 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -6432,6 +6432,10 @@ gtk_tree_view_top_row_to_dy (GtkTreeView *tree_view)
   GtkRBNode *node;
   int new_dy;
 
+  /* Avoid recursive calls */
+  if (tree_view->priv->in_top_row_to_dy)
+    return;
+
   if (tree_view->priv->top_row)
     path = gtk_tree_row_reference_get_path (tree_view->priv->top_row);
   else