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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-05-02 11:31:57 +0300 (Wed, 02 May 2007)
New Revision: 11380

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

	* gtk/gtktreeview.c (gtk_tree_view_grab_notify): stop the rubber
	band here if it's active.  (Merged from upstream, updated
	MAEMO_CHANGES markers).



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-05-02 07:36:21 UTC (rev 11379)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-05-02 08:31:57 UTC (rev 11380)
@@ -1,3 +1,9 @@
+2007-05-02  Kristian Rietveld  <kris at imendio.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_grab_notify): stop the rubber
+	band here if it's active.  (Merged from upstream, updated
+	MAEMO_CHANGES markers).
+
 2007-04-27  Michael Natterer  <mitch at imendio.com>
 
 	Merge from upstream trunk, getting rid of tons and tons

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-05-02 07:36:21 UTC (rev 11379)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-05-02 08:31:57 UTC (rev 11380)
@@ -15357,12 +15357,13 @@
   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->rubber_band_status)
+	gtk_tree_view_stop_rubber_band (tree_view);
+
+#ifdef MAEMO_CHANGES
       if (tree_view->priv->queued_expand_row)
         {
 	  gtk_tree_row_reference_free (tree_view->priv->queued_expand_row);
@@ -15374,8 +15375,8 @@
 	  gtk_tree_row_reference_free (tree_view->priv->queued_activate_row);
 	  tree_view->priv->queued_activate_row = NULL;
 	}
+#endif /* MAEMO_CHANGES */
     }
-#endif /* MAEMO_CHANGES */
 }
 
 static void