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

[notify] lift some logic out of _notify_queue_add

Browse Source 
Lift the check-if-READABLE and redirect-target logic from out of
g_object_notify_queue_add() into its own function, get_notify_pspec().

Use that function at the site of our two calls to
g_object_notify_queue_add().
This commit is contained in:
Ryan Lortie 2011-11-16 15:38:25 +00:00
parent 760037ec46
commit 8215fc5f25
1 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
gobject/gobject.c
View File

@ -309,26 +309,17 @@ g_object_notify_queue_add (GObject *object,
GObjectNotifyQueue *nqueue, GObjectNotifyQueue *nqueue,
GParamSpec *pspec) GParamSpec *pspec)
{ {
if (pspec->flags & G_PARAM_READABLE) G_LOCK(notify_lock);
g_return_if_fail (nqueue->n_pspecs < 65535);
if (g_slist_find (nqueue->pspecs, pspec) == NULL)
{ {
GParamSpec *redirect; nqueue->pspecs = g_slist_prepend (nqueue->pspecs, pspec);
nqueue->n_pspecs++;
redirect = g_param_spec_get_redirect_target (pspec);
if (redirect)
pspec = redirect;
G_LOCK(notify_lock);
g_return_if_fail (nqueue->n_pspecs < 65535);
if (g_slist_find (nqueue->pspecs, pspec) == NULL)
{
nqueue->pspecs = g_slist_prepend (nqueue->pspecs, pspec);
nqueue->n_pspecs++;
}
G_UNLOCK(notify_lock);
} }
G_UNLOCK(notify_lock);
} }
static void static void
@ -1094,15 +1085,39 @@ 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)
{ {
GObjectNotifyQueue *nqueue; GObjectNotifyQueue *nqueue;
GParamSpec *notify_pspec;
nqueue = g_object_notify_queue_freeze (object, &property_notify_context); notify_pspec = get_notify_pspec (pspec);
g_object_notify_queue_add (object, nqueue, pspec);
g_object_notify_queue_thaw (object, nqueue); if (notify_pspec != NULL)
{
nqueue = g_object_notify_queue_freeze (object, &property_notify_context);
g_object_notify_queue_add (object, nqueue, notify_pspec);
g_object_notify_queue_thaw (object, nqueue);
}
} }
/** /**
@ -1318,8 +1333,14 @@ object_set_property (GObject *object,
} }
else else
{ {
GParamSpec *notify_pspec;
class->set_property (object, param_id, &tmp_value, pspec); class->set_property (object, param_id, &tmp_value, pspec);
g_object_notify_queue_add (object, nqueue, pspec);
notify_pspec = get_notify_pspec (pspec);
if (notify_pspec != NULL)
g_object_notify_queue_add (object, nqueue, notify_pspec);
} }
g_value_unset (&tmp_value); g_value_unset (&tmp_value);
} }