[maemo-commits] [maemo-commits] r18571 - in projects/haf/branches/gtk+/upgrade-gtk-2-14: . gtk

[From: subversion at stage.maemo.org]

Author: csaavedra
Date: 2009-06-02 13:53:15 +0300 (Tue, 02 Jun 2009)
New Revision: 18571

Modified:
   projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog
   projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtktreeview.c
Log:
2009-06-01  Kristian Rietveld  <kris at imendio.com>

	Fixes: NB#118755 - Application manager crashes when uninstalling
	an application

	(and it's many duplicates).

	* gtk/gtktreeview.c (gtk_tree_view_button_release): Properly
	handle a NULL ->priv->tree.  We need to run through the remaining
	logic to properly unset row reference of the delayed actions.
	Unfortunately this didn't get caught during my earlier testing due to
	dep. problems ...



Modified: projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog	2009-06-02 09:43:31 UTC (rev 18570)
+++ projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog	2009-06-02 10:53:15 UTC (rev 18571)
@@ -1,3 +1,16 @@
+2009-06-01  Kristian Rietveld  <kris at imendio.com>
+
+	Fixes: NB#118755 - Application manager crashes when uninstalling
+	an application
+
+	(and it's many duplicates).
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_release): Properly
+	handle a NULL ->priv->tree.  We need to run through the remaining
+	logic to properly unset row reference of the delayed actions.
+	Unfortunately this didn't get caught during my earlier testing due to
+	dep. problems ...
+
 2009-05-29  Claudio Saavedra  <csaavedra at igalia.com>
 
 	Releasing 2:2.14.3-1maemo1

Modified: projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtktreeview.c
===================================================================
--- projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtktreeview.c	2009-06-02 09:43:31 UTC (rev 18570)
+++ projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/gtktreeview.c	2009-06-02 10:53:15 UTC (rev 18571)
@@ -3575,11 +3575,22 @@
                         "hildon-mode", &mode,
                         NULL);
 
-  /* Get the node where the mouse was released */
-  new_y = TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, event->y);
-  if (new_y < 0)
-    new_y = 0;
-  _gtk_rbtree_find_offset (tree_view->priv->tree, new_y, &tree, &node);
+  if (tree_view->priv->tree)
+    {
+      /* Get the node where the mouse was released */
+      new_y = TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, event->y);
+      if (new_y < 0)
+        new_y = 0;
+      _gtk_rbtree_find_offset (tree_view->priv->tree, new_y, &tree, &node);
+    }
+  else
+    {
+      /* We just set tree and node to NULL otherwise.  We still want
+       * to run through below's logic to free row references where needed.
+       */
+      tree = NULL;
+      node = NULL;
+    }
 
   if (gtk_tree_row_reference_valid (tree_view->priv->queued_select_row))
     {