From: Will Thompson <will.thompson@collabora.co.uk>
Date: Tue, 22 Sep 2009 14:24:04 +0000 (+0100)
Subject: Cancel existing group animation before starting another
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=d30b840853d62cc54574372aeee1dd85d9b04aab

Cancel existing group animation before starting another

Fixes Gnome bug #595962.
---

diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index bd5c89f1..481bb8a4 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 {