[maemo-commits] [maemo-commits] r17633 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-03-11 13:57:41 +0200 (Wed, 11 Mar 2009)
New Revision: 17633

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktreeview.c
Log:
2009-03-11  Kristian Rietveld  <kris at imendio.com>

	* gtk/gtktreeview.c (gtk_tree_view_set_model): unset highlighted node
	before freeing the queued actions.  Freeing a pending select or
	activate node would otherwise access the already freed rbtree.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-03-10 16:31:56 UTC (rev 17632)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-03-11 11:57:41 UTC (rev 17633)
@@ -1,3 +1,9 @@
+2009-03-11  Kristian Rietveld  <kris at imendio.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model): unset highlighted node
+	before freeing the queued actions.  Freeing a pending select or
+	activate node would otherwise access the already freed rbtree.
+
 2009-03-05  Claudio Saavedra  <csaavedra at igalia.com>
 
 	Released 2:2.12.12-1maemo10

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-03-10 16:31:56 UTC (rev 17632)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-03-11 11:57:41 UTC (rev 17633)
@@ -12294,6 +12294,9 @@
       tree_view->priv->scroll_to_path = NULL;
 
 #ifdef MAEMO_CHANGES
+      tree_view->priv->highlighted_tree = NULL;
+      tree_view->priv->highlighted_node = NULL;
+
       free_queued_actions (tree_view);
 #endif /* MAEMO_CHANGES */