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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-08-10 23:04:02 +0300 (Mon, 10 Aug 2009)
New Revision: 19101

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktreeview.c
Log:
2009-08-10  Kristian Rietveld  <kris at lanedo.com>

	Fixes: NB#130014 - Crash when long tabbing on a contact which was
	deleted in outlook and Active Sync is in progress

	* gtk/gtktreeview.c (gtk_tree_view_free_rbtree): clear state of
	highlighted node,
	(free_queued_select_row): do not only check if the row reference
	pointer is non-NULL, but check for validity,
	(free_queued_activate_row): likewise.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-08-10 15:13:48 UTC (rev 19100)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-08-10 20:04:02 UTC (rev 19101)
@@ -1,3 +1,14 @@
+2009-08-10  Kristian Rietveld  <kris at lanedo.com>
+
+	Fixes: NB#130014 - Crash when long tabbing on a contact which was
+	deleted in outlook and Active Sync is in progress
+
+	* gtk/gtktreeview.c (gtk_tree_view_free_rbtree): clear state of
+	highlighted node,
+	(free_queued_select_row): do not only check if the row reference
+	pointer is non-NULL, but check for validity,
+	(free_queued_activate_row): likewise.
+
 2009-08-06  Sven Herzberg  <herzi at lanedo.com>
 
 	Fixes: NB#129361 - [AF checked] compositing issues with rgba

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-08-10 15:13:48 UTC (rev 19100)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-08-10 20:04:02 UTC (rev 19101)
@@ -1803,6 +1803,10 @@
   tree_view->priv->prelight_node = NULL;
   tree_view->priv->expanded_collapsed_node = NULL;
   tree_view->priv->expanded_collapsed_tree = NULL;
+#ifdef MAEMO_CHANGES
+  tree_view->priv->highlighted_node = NULL;
+  tree_view->priv->highlighted_tree = NULL;
+#endif /* MAEMO_CHANGES */
 }
 
 static void
@@ -17563,7 +17567,7 @@
    * was previously *not* selected.
    */
   if (mode == HILDON_FREMANTLE
-      && tree_view->priv->queued_select_row)
+      && gtk_tree_row_reference_valid (tree_view->priv->queued_select_row))
     {
       if (tree_view->priv->highlighted_node)
         {
@@ -17592,7 +17596,7 @@
 
   if (mode == HILDON_FREMANTLE
       && tree_view->priv->hildon_ui_mode == HILDON_UI_MODE_NORMAL
-      && tree_view->priv->queued_activate_row)
+      && gtk_tree_row_reference_valid (tree_view->priv->queued_activate_row))
     {
       if (tree_view->priv->highlighted_node)
         {