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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-09-19 14:53:51 +0300 (Wed, 19 Sep 2007)
New Revision: 13914

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktreeview.c
Log:
2007-09-19  Kristian Rietveld  <kris at imendio.com>

	* gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row): add
	Maemo specific code to clear all pending actions on a row (pending
	select, activation or expand) if we decide to begin a drag here.
	This avoids clearing the selection when a multiple item drag has
	been finished or cancelled.
	NB#59117.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-09-19 11:15:28 UTC (rev 13913)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-09-19 11:53:51 UTC (rev 13914)
@@ -1,5 +1,14 @@
 2007-09-19  Kristian Rietveld  <kris at imendio.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row): add
+	Maemo specific code to clear all pending actions on a row (pending
+	select, activation or expand) if we decide to begin a drag here.
+	This avoids clearing the selection when a multiple item drag has
+	been finished or cancelled.
+	NB#59117.
+
+2007-09-19  Kristian Rietveld  <kris at imendio.com>
+
 	* gtk/gtktreeview.c (gtk_tree_view_header_focus): add Maemo specific
 	code to immediately return FALSE; this way the headers will always be
 	skipped when the tree view gets focus and it behaves exactly how it

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-09-19 11:15:28 UTC (rev 13913)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-09-19 11:53:51 UTC (rev 13914)
@@ -7497,6 +7497,28 @@
 
   set_source_row (context, model, path);
 
+#ifdef MAEMO_CHANGES
+  /* Clear pending actions on row */
+  if (tree_view->priv->queued_select_row)
+    {
+      gtk_tree_row_reference_free (tree_view->priv->queued_select_row);
+      tree_view->priv->queued_select_row = NULL;
+    }
+
+  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 */
+
+
  out:
   if (path)
     gtk_tree_path_free (path);