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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-08-15 12:29:52 +0300 (Wed, 15 Aug 2007)
New Revision: 13193

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

	* gtk/gtktreeview.c (gtk_tree_view_button_press): only continue
	to queue a row-activated signal or prepare for DnD or tap-n-hold
	if the column didn't handle the click.
	NB#60977.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-08-15 09:20:15 UTC (rev 13192)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-08-15 09:29:52 UTC (rev 13193)
@@ -1,3 +1,10 @@
+2007-08-15  Kristian Rietveld  <kris at imendio.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): only continue
+	to queue a row-activated signal or prepare for DnD or tap-n-hold
+	if the column didn't handle the click.
+	NB#60977.
+
 2007-08-13  Fernando Herrera  <fernando.herrera-de-las-heras at nokia.com>
 
 	* gtk/gtktreeview.c: (gtk_tree_view_move_cursor_up_down): Backport

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-08-15 09:20:15 UTC (rev 13192)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-08-15 09:29:52 UTC (rev 13193)
@@ -2736,6 +2736,7 @@
 
 #ifdef MAEMO_CHANGES
 	  if (node_selected
+	      && !column_handled_click
 	      && gtk_tree_row_reference_valid (tree_view->priv->cursor))
 	    {
 	      GtkTreePath *cursor_path;
@@ -2751,6 +2752,7 @@
 	    }
 
 	  if (node_is_selectable
+	      && !column_handled_click
 	      && !tree_view->priv->queued_activate_row
 	      && tree_view->priv->rubber_band_status == RUBBER_BAND_OFF
 	      && gtk_tree_selection_get_mode (tree_view->priv->selection) == GTK_SELECTION_MULTIPLE)