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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2008-02-13 14:00:39 +0200 (Wed, 13 Feb 2008)
New Revision: 15180

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

	Merge from upstream, fixes NB#75384:

	* gtk/gtktreeview.c (gtk_tree_view_stop_rubber_band): only
	queue a redraw if the rubber banding has actually been active.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-02-13 10:35:52 UTC (rev 15179)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-02-13 12:00:39 UTC (rev 15180)
@@ -1,3 +1,10 @@
+2008-02-13  Kristian Rietveld  <kris at imendio.com>
+
+	Merge from upstream, fixes NB#75384:
+
+	* gtk/gtktreeview.c (gtk_tree_view_stop_rubber_band): only
+	queue a redraw if the rubber banding has actually been active.
+
 2008-02-11  Kristian Rietveld  <kris at imendio.com>
 
 	Merge from upstream, fixes NB#78606:

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2008-02-13 10:35:52 UTC (rev 15179)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2008-02-13 12:00:39 UTC (rev 15180)
@@ -3914,12 +3914,12 @@
   remove_scroll_timeout (tree_view);
   gtk_grab_remove (GTK_WIDGET (tree_view));
 
-  gtk_widget_queue_draw (GTK_WIDGET (tree_view));
-
   if (tree_view->priv->rubber_band_status == RUBBER_BAND_ACTIVE)
     {
       GtkTreePath *tmp_path;
 
+      gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+
       /* The anchor path should be set to the start path */
       tmp_path = _gtk_tree_view_find_path (tree_view,
 					   tree_view->priv->rubber_band_start_tree,