From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 30 Jan 2012 14:47:23 +0000 (+0100)
Subject: individual_view_drag_end: remove the auto scroll
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=6048958136681930af236460e9cb159b5267c4d0;hp=e0396bbe64cff169221bb527836944aa96f58261

individual_view_drag_end: remove the auto scroll

This ensures that we'll stop scrolling if the DnD operation hasn't been
completed.

https://bugzilla.gnome.org/show_bug.cgi?id=662916
---

diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index dad975b3..90618997 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -892,6 +892,12 @@ individual_view_drag_end (GtkWidget *widget,
       gtk_tree_row_reference_free (priv->drag_row);
       priv->drag_row = NULL;
     }
+
+  if (priv->auto_scroll_timeout_id != 0)
+    {
+      g_source_remove (priv->auto_scroll_timeout_id);
+      priv->auto_scroll_timeout_id = 0;
+    }
 }
 
 static gboolean