From 6f5b19a0a534764dad7b8bd0f397a46dc06bef9d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 18 Dec 2015 16:55:21 -0500 Subject: css node: Use g_set_object Replace unref + assignment + ref combinations by g_set_object_calls. --- gtk/gtkcssnode.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gtk/gtkcssnode.c b/gtk/gtkcssnode.c index b129c01df2..fca7de0cec 100644 --- a/gtk/gtkcssnode.c +++ b/gtk/gtkcssnode.c @@ -615,8 +615,7 @@ static void gtk_css_node_real_style_changed (GtkCssNode *cssnode, GtkCssStyleChange *change) { - g_object_unref (cssnode->style); - cssnode->style = g_object_ref (gtk_css_style_change_get_new_style (change)); + g_set_object (&cssnode->style, gtk_css_style_change_get_new_style (change)); } static void @@ -998,8 +997,7 @@ gtk_css_node_set_style (GtkCssNode *cssnode, (GTK_IS_CSS_ANIMATED_STYLE (cssnode->style) || GTK_IS_CSS_ANIMATED_STYLE (style))) { /* This is when animations are starting/stopping but they didn't change any CSS this frame */ - g_object_unref (cssnode->style); - cssnode->style = g_object_ref (style); + g_set_object (&cssnode->style, style); } gtk_css_style_change_finish (&change); -- cgit v1.2.1