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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2008-07-03 18:00:02 +0300 (Thu, 03 Jul 2008)
New Revision: 15735

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktreeview.c
Log:
2008-07-03  Kristian Rietveld  <kris at imendio.com>

	* gtk/gtktreeview.c (gtk_tree_view_button_release): call
	free_queued_select_row() for both modes; no longer needed to call
	this before the other operations for fremantle mode, removed
	comment.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-07-03 13:54:20 UTC (rev 15734)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-07-03 15:00:02 UTC (rev 15735)
@@ -1,5 +1,12 @@
 2008-07-03  Kristian Rietveld  <kris at imendio.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_button_release): call
+	free_queued_select_row() for both modes; no longer needed to call
+	this before the other operations for fremantle mode, removed
+	comment.
+
+2008-07-03  Kristian Rietveld  <kris at imendio.com>
+
 	* gtk/gtktreeprivate.h: update fields.
 
 	* gtk/gtktreeview.c (gtk_tree_view_init),

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2008-07-03 13:54:20 UTC (rev 15734)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2008-07-03 15:00:02 UTC (rev 15735)
@@ -3327,16 +3327,6 @@
 
       path = gtk_tree_row_reference_get_path (tree_view->priv->queued_select_row);
 
-      /* For new-style we've temporary selected the node to get the
-       * highlight drawn.  We unselect it here to have the selection
-       * logic below function properly.
-       *
-       * This does queue a draw, but the selection logic below
-       * is about to queue a draw for this anyway too.
-       */
-      if (mode == HILDON_FREMANTLE)
-        free_queued_select_row (tree_view);
-
       if (tree_view->priv->queued_ctrl_pressed)
         {
 	  gtk_tree_view_real_set_cursor (tree_view, path, FALSE, TRUE);
@@ -3352,6 +3342,7 @@
       else
 	gtk_tree_view_real_set_cursor (tree_view, path, TRUE, TRUE);
 
+      free_queued_select_row (tree_view);
       gtk_tree_path_free (path);
       tree_view->priv->queued_ctrl_pressed = FALSE;
       tree_view->priv->queued_shift_pressed = FALSE;