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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-04-17 11:40:16 +0300 (Fri, 17 Apr 2009)
New Revision: 18097

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

	Fixes: NB#110430 - Failed assertion in _gtk_rbtree_node_find_offset()

	* gtk/gtktreeview.c (gtk_tree_view_row_deleted): when the (tree, node)
	being deleted is the highlighted one, set the highlight to NULL.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-04-17 08:33:47 UTC (rev 18096)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-04-17 08:40:16 UTC (rev 18097)
@@ -1,5 +1,12 @@
 2009-04-17  Kristian Rietveld  <kris at imendio.com>
 
+	Fixes: NB#110430 - Failed assertion in _gtk_rbtree_node_find_offset()
+
+	* gtk/gtktreeview.c (gtk_tree_view_row_deleted): when the (tree, node)
+	being deleted is the highlighted one, set the highlight to NULL.
+
+2009-04-17  Kristian Rietveld  <kris at imendio.com>
+
 	Fixes: NB#111246 - GtkTreeView action area height in portrait
 	should be n*90px
 

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-04-17 08:33:47 UTC (rev 18096)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-04-17 08:40:16 UTC (rev 18097)
@@ -9832,6 +9832,15 @@
   /* Ensure we don't have a dangling pointer to a dead node */
   ensure_unprelighted (tree_view);
 
+#ifdef MAEMO_CHANGES
+  if (node == tree_view->priv->highlighted_node
+      && tree == tree_view->priv->highlighted_tree)
+    {
+      tree_view->priv->highlighted_node = NULL;
+      tree_view->priv->highlighted_tree = NULL;
+    }
+#endif /* MAEMO_CHANGES */
+
   /* Cancel editting if we've started */
   gtk_tree_view_stop_editing (tree_view, TRUE);