gtk+ r20220 - in branches/gtk-2-12: . gtk

[kristian svn gnome org]

Author: kristian
Date: Wed May 28 14:49:00 2008
New Revision: 20220
URL: http://svn.gnome.org/viewvc/gtk+?rev=20220&view=rev

Log:
2008-05-28  Kristian Rietveld  <kris imendio com>

	Merge from trunk:

	Bug 449625 - crash in gtk_tree_view_real_move_cursor at
	gtktreeview.c:9641

	* gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down):
	cursor_offset *must* be larger than background height of the cursor
	node, not just equal otherwise there is no guarantee there is a next
	node.



Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtktreeview.c

Modified: branches/gtk-2-12/gtk/gtktreeview.c
==============================================================================
--- branches/gtk-2-12/gtk/gtktreeview.c	(original)
+++ branches/gtk-2-12/gtk/gtktreeview.c	Wed May 28 14:49:00 2008
@@ -9832,7 +9832,7 @@
     _gtk_rbtree_find_offset (tree_view->priv->tree, y,
 			     &cursor_tree, &cursor_node);
 
-  if (tree_view->priv->cursor_offset >= BACKGROUND_HEIGHT (cursor_node))
+  if (tree_view->priv->cursor_offset > BACKGROUND_HEIGHT (cursor_node))
     {
       _gtk_rbtree_next_full (cursor_tree, cursor_node,
 			     &cursor_tree, &cursor_node);