Merge branch 'master' into windows

[ardour.git] / libs / clearlooks-newer / animation.c

diff --git a/libs/clearlooks-newer/animation.c b/libs/clearlooks-newer/animation.c
index 2c6a6fdc420312336ffce220441d5c67b679c03e..8339ed7c195dceb36c92411b873a3a72f1837d8a 100644 (file)
--- a/libs/clearlooks-newer/animation.c
+++ b/libs/clearlooks-newer/animation.c
@@ -159,11 +159,12 @@ add_animation (const GtkWidget *widget, gdouble stop_time)
 static gboolean
 update_animation_info (gpointer key, gpointer value, gpointer user_data)
 {
-       (void) user_data;
-       
-       AnimationInfo *animation_info = value;
+       AnimationInfo *animation_info;
        GtkWidget *widget = key;
        
+       animation_info = value;
+       (void) user_data;
+       
        g_assert ((widget != NULL) && (animation_info != NULL));
        
        /* remove the widget from the hash table if it is not drawable */
@@ -217,9 +218,10 @@ animation_timeout_handler (gpointer data)
 static void
 on_checkbox_toggle (GtkWidget *widget, gpointer data)
 {
+       AnimationInfo *animation_info;
        (void) data;
        
-       AnimationInfo *animation_info = lookup_animation_info (widget);
+       animation_info = lookup_animation_info (widget);
        
        if (animation_info != NULL)
        {