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 bd5c89f19cb094890d8d48f0fbc980b9eac7b3a5..481bb8a49306b63039e2a646bfb1bee1e5cce2af 100644 (file)
--- 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);
 
 
        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 {
        if (expanding) {
                priv->animation_style = GTK_EXPANDER_SEMI_COLLAPSED;
        } else {