[gtk/wip/baedert/for-master: 17/29] cssanimatedstyle: Make set_animated_value transfer-full



commit 0f0232f6b3305414f781b0a856ace4a0c8b36c51
Author: Timm Bäder <mail baedert org>
Date:   Mon Aug 19 11:06:04 2019 +0200

    cssanimatedstyle: Make set_animated_value transfer-full

 gtk/gtkcssanimatedstyle.c | 3 ++-
 gtk/gtkcssanimation.c     | 1 -
 gtk/gtkcssdynamic.c       | 3 ++-
 gtk/gtkcsstransition.c    | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkcssanimatedstyle.c b/gtk/gtkcssanimatedstyle.c
index 8f5f195800..ece7037bc6 100644
--- a/gtk/gtkcssanimatedstyle.c
+++ b/gtk/gtkcssanimatedstyle.c
@@ -145,7 +145,8 @@ gtk_css_animated_style_set_animated_value (GtkCssAnimatedStyle *style,
 
   if (g_ptr_array_index (style->animated_values, id))
     _gtk_css_value_unref (g_ptr_array_index (style->animated_values, id));
-  g_ptr_array_index (style->animated_values, id) = _gtk_css_value_ref (value);
+
+  g_ptr_array_index (style->animated_values, id) = value;
 
 }
 
diff --git a/gtk/gtkcssanimation.c b/gtk/gtkcssanimation.c
index dab839d6a3..445b58d24d 100644
--- a/gtk/gtkcssanimation.c
+++ b/gtk/gtkcssanimation.c
@@ -113,7 +113,6 @@ gtk_css_animation_apply_values (GtkStyleAnimation    *style_animation,
                                             progress,
                                             gtk_css_animated_style_get_intrinsic_value (style, property_id));
       gtk_css_animated_style_set_animated_value (style, property_id, value);
-      _gtk_css_value_unref (value);
     }
 }
 
diff --git a/gtk/gtkcssdynamic.c b/gtk/gtkcssdynamic.c
index 1d06c1c1fc..89243b701c 100644
--- a/gtk/gtkcssdynamic.c
+++ b/gtk/gtkcssdynamic.c
@@ -47,7 +47,8 @@ gtk_css_dynamic_apply_values (GtkStyleAnimation    *style_animation,
       dynamic_value = gtk_css_value_get_dynamic_value (value, dynamic->timestamp);
       if (value != dynamic_value)
         gtk_css_animated_style_set_animated_value (style, i, dynamic_value);
-      gtk_css_value_unref (dynamic_value);
+      else
+        gtk_css_value_unref (dynamic_value);
     }
 }
 
diff --git a/gtk/gtkcsstransition.c b/gtk/gtkcsstransition.c
index 5f8e1a4fd1..23478b618b 100644
--- a/gtk/gtkcsstransition.c
+++ b/gtk/gtkcsstransition.c
@@ -78,7 +78,6 @@ gtk_css_transition_apply_values (GtkStyleAnimation   *style_animation,
     value = _gtk_css_value_ref (end);
 
   gtk_css_animated_style_set_animated_value (style, transition->property, value);
-  _gtk_css_value_unref (value);
 }
 
 static gboolean


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]