luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-14 00:06:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

gobject: Only emit deprecation warnings for user-specified properties

Browse Source 
If a deprecated property only gets set because it is G_PARAM_CONSTRUCT
or G_PARAM_CONSTRUCT_ONLY, then there is nothing for the library user
to fix, and we should not emit a deprecation warning.

Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/2748
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-09-13 11:14:32 +01:00
parent 98d071498b
commit b88474ee7c
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gobject/gobject.c
View File

@ -1766,7 +1766,8 @@ static inline void
object_set_property (GObject *object, object_set_property (GObject *object,
GParamSpec *pspec, GParamSpec *pspec,
const GValue *value, const GValue *value,
GObjectNotifyQueue *nqueue) GObjectNotifyQueue *nqueue,
gboolean user_specified)
{ {
GTypeInstance *inst = (GTypeInstance *) object; GTypeInstance *inst = (GTypeInstance *) object;
GObjectClass *class; GObjectClass *class;
@ -1782,6 +1783,7 @@ object_set_property (GObject *object,
param_spec_follow_override (&pspec); param_spec_follow_override (&pspec);
if (user_specified)
consider_issuing_property_deprecation_warning (pspec); consider_issuing_property_deprecation_warning (pspec);
pclass = G_PARAM_SPEC_GET_CLASS (pspec); pclass = G_PARAM_SPEC_GET_CLASS (pspec);
@ -2202,7 +2204,7 @@ g_object_new_with_custom_constructor (GObjectClass *class,
/* set remaining properties */ /* set remaining properties */
for (i = 0; i < n_params; i++) for (i = 0; i < n_params; i++)
if (!(params[i].pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))) if (!(params[i].pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)))
object_set_property (object, params[i].pspec, params[i].value, nqueue); object_set_property (object, params[i].pspec, params[i].value, nqueue, TRUE);
/* If nqueue is non-NULL then we are frozen. Thaw it. */ /* If nqueue is non-NULL then we are frozen. Thaw it. */
if (nqueue) if (nqueue)
@ -2252,6 +2254,7 @@ g_object_new_internal (GObjectClass *class,
const GValue *value; const GValue *value;
GParamSpec *pspec; GParamSpec *pspec;
guint j; guint j;
gboolean user_specified = FALSE;
pspec = node->data; pspec = node->data;
value = NULL; /* to silence gcc... */ value = NULL; /* to silence gcc... */
@ -2260,13 +2263,14 @@ g_object_new_internal (GObjectClass *class,
if (params[j].pspec == pspec) if (params[j].pspec == pspec)
{ {
value = params[j].value; value = params[j].value;
user_specified = TRUE;
break; break;
} }
if (value == NULL) if (value == NULL)
value = g_param_spec_get_default_value (pspec); value = g_param_spec_get_default_value (pspec);
object_set_property (object, pspec, value, nqueue); object_set_property (object, pspec, value, nqueue, user_specified);
} }
} }
@ -2279,7 +2283,7 @@ g_object_new_internal (GObjectClass *class,
*/ */
for (i = 0; i < n_params; i++) for (i = 0; i < n_params; i++)
if (!(params[i].pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))) if (!(params[i].pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)))
object_set_property (object, params[i].pspec, params[i].value, nqueue); object_set_property (object, params[i].pspec, params[i].value, nqueue, TRUE);
if (nqueue) if (nqueue)
g_object_notify_queue_thaw (object, nqueue); g_object_notify_queue_thaw (object, nqueue);
@ -2610,7 +2614,7 @@ g_object_constructor (GType type,
GParamSpec *pspec = construct_params->pspec; GParamSpec *pspec = construct_params->pspec;
construct_params++; construct_params++;
object_set_property (object, pspec, value, nqueue); object_set_property (object, pspec, value, nqueue, TRUE);
} }
g_object_notify_queue_thaw (object, nqueue); g_object_notify_queue_thaw (object, nqueue);
/* the notification queue is still frozen from g_object_init(), so /* the notification queue is still frozen from g_object_init(), so
@ -2698,7 +2702,7 @@ g_object_setv (GObject *object,
if (!g_object_set_is_valid_property (object, pspec, names[i])) if (!g_object_set_is_valid_property (object, pspec, names[i]))
break; break;
object_set_property (object, pspec, &values[i], nqueue); object_set_property (object, pspec, &values[i], nqueue, TRUE);
} }
if (nqueue) if (nqueue)
@ -2756,7 +2760,7 @@ g_object_set_valist (GObject *object,
break; break;
} }
object_set_property (object, pspec, &value, nqueue); object_set_property (object, pspec, &value, nqueue, TRUE);
/* We open-code g_value_unset() here to avoid the /* We open-code g_value_unset() here to avoid the
* cost of looking up the GTypeValueTable again. * cost of looking up the GTypeValueTable again.