gtk+ r20334 - in trunk: . gtk

[kristian svn gnome org]

Author: kristian
Date: Sun Jun  8 12:53:19 2008
New Revision: 20334
URL: http://svn.gnome.org/viewvc/gtk+?rev=20334&view=rev

Log:
2008-06-08  Kristian Rietveld  <kris gtk org>

	Bug 536730 - memory corruption in gtktreeview

	* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): first
	remove the expand/collapse timeout and node, then free the rbtree.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtktreeview.c

Modified: trunk/gtk/gtktreeview.c
==============================================================================
--- trunk/gtk/gtktreeview.c	(original)
+++ trunk/gtk/gtktreeview.c	Sun Jun  8 12:53:19 2008
@@ -12217,6 +12217,8 @@
       gtk_tree_path_free (lsc);
     }
 
+  remove_expand_collapse_timeout (tree_view);
+
   if (gtk_tree_view_unref_and_check_selection_tree (tree_view, node->children))
     {
       _gtk_rbtree_remove (node->children);
@@ -12224,8 +12226,6 @@
     }
   else
     _gtk_rbtree_remove (node->children);
-
-  remove_expand_collapse_timeout (tree_view);
   
   if (animate)
     add_expand_collapse_timeout (tree_view, tree, node, FALSE);