[glib/gobject-speedups: 14/23] Move deprecation warnings to object_set_property




commit 97ce5eb53dbeb0be61815d70b192d383c44e17cf
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat May 14 23:26:58 2022 -0400

    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 ea0670a340..e41db2da04 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -1601,6 +1601,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 ||
@@ -2030,10 +2032,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)
@@ -2081,7 +2080,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;
               }
@@ -2107,10 +2105,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);
     }
@@ -2516,7 +2511,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);
     }
 
@@ -2571,7 +2565,6 @@ g_object_set_valist (GObject       *object,
          break;
        }
 
-      consider_issuing_property_deprecation_warning (pspec);
       object_set_property (object, pspec, &value, nqueue);
       g_value_unset (&value);
 


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