summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorKristian Rietveld <kris@gtk.org>2009-09-06 20:23:05 +0200
committerKristian Rietveld <kris@gtk.org>2009-09-06 20:26:09 +0200
commitf77042aae2e33e99e2824058ff516b114d01b78a (patch)
tree5c355e177c05a1d58886091eb69396d2459d66f6 /gtk
parent3d3f8697c0f02b52f85b04994fa0a3a85d7441db (diff)
downloadgtk+-f77042aae2e33e99e2824058ff516b114d01b78a.tar.gz
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().
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtktreeview.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 665720fe55..a0fdf33072 100644
--- 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