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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-10-08 16:39:10 +0300 (Mon, 08 Oct 2007)
New Revision: 14356

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktreeview.c
Log:
2007-10-08  Xan Lopez  <xan.lopez at nokia.com>

	Patch by Tommi.

	* gtk/gtktreeview.c (gtk_tree_view_row_deleted): stop rubberbanding
	when a row is deleted. It avoids certain crashers when rows inside the
	selection are deleted and gtk_tree_view_stop_rubber_band is then called.

	The correct fix would probably be to correctly maintain the state of
	the rubber band data on row_delete.

	Fixes: NB#71834


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-10-08 13:15:56 UTC (rev 14355)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-10-08 13:39:10 UTC (rev 14356)
@@ -1,3 +1,16 @@
+2007-10-08  Xan Lopez  <xan.lopez at nokia.com>
+
+	Patch by Tommi.
+
+	* gtk/gtktreeview.c (gtk_tree_view_row_deleted): stop rubberbanding
+	when a row is deleted. It avoids certain crashers when rows inside the
+	selection are deleted and gtk_tree_view_stop_rubber_band is then called.
+
+	The correct fix would probably be to correctly maintain the state of
+	the rubber band data on row_delete.
+
+	Fixes: NB#71834
+
 2007-10-04  Xan Lopez  <xan.lopez at nokia.com>
 	
 	* gtk/gtkcontainer.c (gtk_container_destroy): remove the container

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-10-08 13:15:56 UTC (rev 14355)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-10-08 13:39:10 UTC (rev 14356)
@@ -8987,6 +8987,14 @@
       tree_view->priv->expanded_collapsed_node = NULL;
     }
 
+#ifdef MAEMO_CHANGES
+  /* Stop rubber banding as row deletion invalidates the start/end
+   * rbtree/nodes. Should consider updating the pointers instead.
+   */
+  if (tree_view->priv->rubber_band_status)
+    gtk_tree_view_stop_rubber_band (tree_view);
+#endif
+
   if (tree_view->priv->destroy_count_func)
     {
       gint child_count = 0;