[maemo-commits] [maemo-commits] r9867 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-02-14 17:34:24 +0200 (Wed, 14 Feb 2007)
New Revision: 9867

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.c
Log:
2007-02-14  Kristian Rietveld  <kris at imendio.com>

	* gtk/gtktreeview.c (gtk_tree_view_grab_notify): stop possibly
	pending activate, collapse, expand operations when the grab is
	lifted.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-14 15:29:03 UTC (rev 9866)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-14 15:34:24 UTC (rev 9867)
@@ -1,3 +1,9 @@
+2007-02-14  Kristian Rietveld  <kris at imendio.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_grab_notify): stop possibly
+	pending activate, collapse, expand operations when the grab is
+	lifted.
+
 Wed Feb 14 15:57:12 2007  Tim Janik  <timj at gtk.org>
 
 	* gtk/gtkrange.c: applied arrow_paint_box_layout MAEMO patch to

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.c	2007-02-14 15:29:03 UTC (rev 9866)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.c	2007-02-14 15:34:24 UTC (rev 9867)
@@ -15357,7 +15357,25 @@
   tree_view->priv->in_grab = !was_grabbed;
 
   if (!was_grabbed)
+#ifndef MAEMO_CHANGES
     tree_view->priv->pressed_button = -1;
+#else /* MAEMO_CHANGES */
+    {
+      tree_view->priv->pressed_button = -1;
+
+      if (tree_view->priv->queued_expand_row)
+        {
+	  gtk_tree_row_reference_free (tree_view->priv->queued_expand_row);
+	  tree_view->priv->queued_expand_row = NULL;
+	}
+
+      if (tree_view->priv->queued_activate_row)
+        {
+	  gtk_tree_row_reference_free (tree_view->priv->queued_activate_row);
+	  tree_view->priv->queued_activate_row = NULL;
+	}
+    }
+#endif /* MAEMO_CHANGES */
 }
 
 static void