From 4b7ce7db096bfbb6fe3d3c11742a7473f0d76234 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 14 May 2022 23:26:58 -0400 Subject: [PATCH] Move deprecation warnings to object_set_property A small reorg that reduces the code and matches what we do for object_get_property. --- gobject/gobject.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gobject/gobject.c b/gobject/gobject.c index d02200b44..8a7b98098 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -1590,6 +1590,8 @@ object_set_property (GObject *object, if (redirect) pspec = redirect; + consider_issuing_property_deprecation_warning (pspec); + pclass = G_PARAM_SPEC_GET_CLASS (pspec); if (g_value_type_compatible (G_VALUE_TYPE (value), pspec->value_type) && (pclass->value_validate == NULL || @@ -2019,10 +2021,7 @@ g_object_new_with_custom_constructor (GObjectClass *class, /* set remaining properties */ for (i = 0; i < n_params; i++) if (!(params[i].pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))) - { - consider_issuing_property_deprecation_warning (params[i].pspec); - object_set_property (object, params[i].pspec, params[i].value, nqueue); - } + object_set_property (object, params[i].pspec, params[i].value, nqueue); /* If nqueue is non-NULL then we are frozen. Thaw it. */ if (nqueue) @@ -2070,7 +2069,6 @@ g_object_new_internal (GObjectClass *class, for (j = 0; j < n_params; j++) if (params[j].pspec == pspec) { - consider_issuing_property_deprecation_warning (pspec); value = params[j].value; break; } @@ -2096,10 +2094,7 @@ g_object_new_internal (GObjectClass *class, */ for (i = 0; i < n_params; i++) if (!(params[i].pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))) - { - consider_issuing_property_deprecation_warning (params[i].pspec); - object_set_property (object, params[i].pspec, params[i].value, nqueue); - } + object_set_property (object, params[i].pspec, params[i].value, nqueue); g_object_notify_queue_thaw (object, nqueue); } @@ -2517,7 +2512,6 @@ g_object_setv (GObject *object, if (!g_object_set_is_valid_property (object, pspec, names[i])) break; - consider_issuing_property_deprecation_warning (pspec); object_set_property (object, pspec, &values[i], nqueue); } @@ -2572,7 +2566,6 @@ g_object_set_valist (GObject *object, break; } - consider_issuing_property_deprecation_warning (pspec); object_set_property (object, pspec, &value, nqueue); /* We open-code g_value_unset() here to avoid the