luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-03 22:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify g_object_notify_by_pspec

Browse Source 
Fold get_notify_pspec into its only caller.
This commit is contained in:
Matthias Clasen 2022-05-21 07:28:03 -04:00
parent 964f6ef8d0
commit 149b0f03b4
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gobject/gobject.c
View File

@ -1315,33 +1315,20 @@ g_object_freeze_notify (GObject *object)
g_object_unref (object); g_object_unref (object);
} }
static GParamSpec *
get_notify_pspec (GParamSpec *pspec)
{
GParamSpec *redirected;
/* we don't notify on non-READABLE parameters */
if (~pspec->flags & G_PARAM_READABLE)
return NULL;
/* if the paramspec is redirected, notify on the target */
redirected = g_param_spec_get_redirect_target (pspec);
if (redirected != NULL)
return redirected;
/* else, notify normally */
return pspec;
}
static inline void static inline void
g_object_notify_by_spec_internal (GObject *object, g_object_notify_by_spec_internal (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GParamSpec *notify_pspec; GParamSpec *redirected;
notify_pspec = get_notify_pspec (pspec); if (G_UNLIKELY (~pspec->flags & G_PARAM_READABLE))
return;
if (notify_pspec != NULL) redirected = g_param_spec_get_redirect_target (pspec);
if (redirected != NULL)
pspec = redirected;
if (pspec != NULL)
{ {
GObjectNotifyQueue *nqueue; GObjectNotifyQueue *nqueue;
@ -1351,13 +1338,13 @@ g_object_notify_by_spec_internal (GObject *object,
if (nqueue != NULL) if (nqueue != NULL)
{ {
/* we're frozen, so add to the queue and release our freeze */ /* we're frozen, so add to the queue and release our freeze */
g_object_notify_queue_add (object, nqueue, notify_pspec); g_object_notify_queue_add (object, nqueue, pspec);
g_object_notify_queue_thaw (object, nqueue); g_object_notify_queue_thaw (object, nqueue);
} }
else else
/* not frozen, so just dispatch the notification directly */ /* not frozen, so just dispatch the notification directly */
G_OBJECT_GET_CLASS (object) G_OBJECT_GET_CLASS (object)
->dispatch_properties_changed (object, 1, &notify_pspec); ->dispatch_properties_changed (object, 1, &pspec);
} }
} }