From 266408254960048a1be4f773e3526dd046ed3d34 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 6 Jan 2015 12:08:49 +0100
Subject: [PATCH] stylecontext: update_animating() properly

Because we can switch from animating to non-animating pretty much
anywhere, do the check for animations unconditionally instead of trying
to cram it into the correct if path (and failing).
---
 gtk/gtkstylecontext.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 45f53bfb92..c83fd46300 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -2948,7 +2948,6 @@ _gtk_style_context_validate (GtkStyleContext  *context,
                                           gtk_style_context_should_create_transitions (context) ? current : NULL);
 
       style_info_set_values (info, style);
-      _gtk_style_context_update_animating (context);
 
       g_object_unref (static_style);
       g_object_unref (style);
@@ -2995,13 +2994,11 @@ _gtk_style_context_validate (GtkStyleContext  *context,
                                                            timestamp);
           style_info_set_values (info, new_values);
           g_object_unref (new_values);
-
-          if (!GTK_IS_CSS_ANIMATED_STYLE (info->values) ||
-              gtk_css_animated_style_is_static (GTK_CSS_ANIMATED_STYLE (info->values)))
-            _gtk_style_context_update_animating (context);
         }
     }
 
+  _gtk_style_context_update_animating (context);
+
   changes = gtk_css_style_get_difference (info->values, current);
   g_object_unref (current);