From db97f8660abd2e386d1dbedf14fc615f1d52acac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 5 Feb 2011 17:54:02 +0000 Subject: [PATCH] Use faster new G_VALUE_COLLECT_INIT variant instead G_VALUE_COLLECT Fixes https://bugzilla.gnome.org/show_bug.cgi?id=641621 --- gtk/gtkcellarea.c | 4 ++-- gtk/gtkcontainer.c | 5 +++-- gtk/gtkliststore.c | 4 ++-- gtk/gtkstyleproperties.c | 5 ++--- gtk/gtktreestore.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c index 56cb0a396c..3050ff578b 100644 --- a/gtk/gtkcellarea.c +++ b/gtk/gtkcellarea.c @@ -2671,8 +2671,8 @@ gtk_cell_area_cell_set_valist (GtkCellArea *area, break; } - g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec)); - G_VALUE_COLLECT (&value, var_args, 0, &error); + G_VALUE_COLLECT_INIT (&value, G_PARAM_SPEC_VALUE_TYPE (pspec), + var_args, 0, &error); if (error) { g_warning ("%s: %s", G_STRLOC, error); diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 18f046c589..ad389416ab 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -1004,8 +1004,9 @@ gtk_container_child_set_valist (GtkContainer *container, G_OBJECT_TYPE_NAME (container)); break; } - g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec)); - G_VALUE_COLLECT (&value, var_args, 0, &error); + + G_VALUE_COLLECT_INIT (&value, G_PARAM_SPEC_VALUE_TYPE (pspec), + var_args, 0, &error); if (error) { g_warning ("%s: %s", G_STRLOC, error); diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index 2c576bbbbe..1d39e8ee83 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -875,9 +875,9 @@ gtk_list_store_set_valist_internal (GtkListStore *list_store, g_warning ("%s: Invalid column number %d added to iter (remember to end your list of columns with a -1)", G_STRLOC, column); break; } - g_value_init (&value, priv->column_headers[column]); - G_VALUE_COLLECT (&value, var_args, 0, &error); + G_VALUE_COLLECT_INIT (&value, priv->column_headers[column], + var_args, 0, &error); if (error) { g_warning ("%s: %s", G_STRLOC, error); diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c index f3a325dc46..38ededc295 100644 --- a/gtk/gtkstyleproperties.c +++ b/gtk/gtkstyleproperties.c @@ -736,9 +736,8 @@ gtk_style_properties_set_valist (GtkStyleProperties *props, if (G_IS_VALUE (val)) g_value_unset (val); - g_value_init (val, node->pspec->value_type); - G_VALUE_COLLECT (val, args, 0, &error); - + G_VALUE_COLLECT_INIT (val, node->pspec->value_type, + args, 0, &error); if (error) { g_warning ("Could not set style property \"%s\": %s", property_name, error); diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 29544d2fda..a1a91c24ad 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -1041,9 +1041,9 @@ gtk_tree_store_set_valist_internal (GtkTreeStore *tree_store, g_warning ("%s: Invalid column number %d added to iter (remember to end your list of columns with a -1)", G_STRLOC, column); break; } - g_value_init (&value, priv->column_headers[column]); - G_VALUE_COLLECT (&value, var_args, 0, &error); + G_VALUE_COLLECT_INIT (&value, priv->column_headers[column], + var_args, 0, &error); if (error) { g_warning ("%s: %s", G_STRLOC, error);