aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2009-09-22 22:24:04 +0800
committerWill Thompson <will.thompson@collabora.co.uk>2009-09-23 19:28:48 +0800
commitd30b840853d62cc54574372aeee1dd85d9b04aab (patch)
tree5f189339688b655f4dfa89f90f36df5ddd2ec6d1 /libempathy-gtk
parentcf5784fe3e77bedfe25f3b31dff6eb92e7a580ee (diff)
downloadgsoc2013-empathy-d30b840853d62cc54574372aeee1dd85d9b04aab.tar
gsoc2013-empathy-d30b840853d62cc54574372aeee1dd85d9b04aab.tar.gz
gsoc2013-empathy-d30b840853d62cc54574372aeee1dd85d9b04aab.tar.bz2
gsoc2013-empathy-d30b840853d62cc54574372aeee1dd85d9b04aab.tar.lz
gsoc2013-empathy-d30b840853d62cc54574372aeee1dd85d9b04aab.tar.xz
gsoc2013-empathy-d30b840853d62cc54574372aeee1dd85d9b04aab.tar.zst
gsoc2013-empathy-d30b840853d62cc54574372aeee1dd85d9b04aab.zip
Cancel existing group animation before starting another
Fixes Gnome bug #595962.
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-cell-renderer-expander.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index bd5c89f19..481bb8a49 100644
--- a/libempathy-gtk/empathy-cell-renderer-expander.c
+++ b/libempathy-gtk/empathy-cell-renderer-expander.c
@@ -428,6 +428,13 @@ empathy_cell_renderer_expander_start_animation (EmpathyCellRendererExpander *exp
priv = GET_PRIV (expander);
+ if (priv->animation_timeout != 0) {
+ g_source_remove (priv->animation_timeout);
+ priv->animation_timeout = 0;
+ gtk_tree_row_reference_free (priv->animation_node);
+ priv->animation_node = NULL;
+ }
+
if (expanding) {
priv->animation_style = GTK_EXPANDER_SEMI_COLLAPSED;
} else {