aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-01-30 22:47:23 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-01-31 17:23:54 +0800
commit6048958136681930af236460e9cb159b5267c4d0 (patch)
treee26cbeadf2cf700436a594fd9e26d914fe4802f8
parente0396bbe64cff169221bb527836944aa96f58261 (diff)
downloadgsoc2013-empathy-6048958136681930af236460e9cb159b5267c4d0.tar
gsoc2013-empathy-6048958136681930af236460e9cb159b5267c4d0.tar.gz
gsoc2013-empathy-6048958136681930af236460e9cb159b5267c4d0.tar.bz2
gsoc2013-empathy-6048958136681930af236460e9cb159b5267c4d0.tar.lz
gsoc2013-empathy-6048958136681930af236460e9cb159b5267c4d0.tar.xz
gsoc2013-empathy-6048958136681930af236460e9cb159b5267c4d0.tar.zst
gsoc2013-empathy-6048958136681930af236460e9cb159b5267c4d0.zip
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
-rw-r--r--libempathy-gtk/empathy-individual-view.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index dad975b3c..90618997d 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