From 5b984c1e533684f3a09b506766f5508b1510e54c Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 8 Apr 2020 12:05:16 -0300 Subject: [PATCH] clutter/constraint: Override ClutterActorMeta.set_enabled Pretty much like the previous commit. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1187 --- clutter/clutter/clutter-constraint.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/clutter/clutter/clutter-constraint.c b/clutter/clutter/clutter-constraint.c index b575fc63d..fc0590744 100644 --- a/clutter/clutter/clutter-constraint.c +++ b/clutter/clutter/clutter-constraint.c @@ -160,28 +160,26 @@ constraint_update_preferred_size (ClutterConstraint *constraint, } static void -clutter_constraint_notify (GObject *gobject, - GParamSpec *pspec) +clutter_constraint_set_enabled (ClutterActorMeta *meta, + gboolean is_enabled) { - if (strcmp (pspec->name, "enabled") == 0) - { - ClutterActorMeta *meta = CLUTTER_ACTOR_META (gobject); - ClutterActor *actor = clutter_actor_meta_get_actor (meta); + ClutterActorMetaClass *parent_class = + CLUTTER_ACTOR_META_CLASS (clutter_constraint_parent_class); + ClutterActor *actor; - if (actor != NULL) - clutter_actor_queue_relayout (actor); - } + actor = clutter_actor_meta_get_actor (meta); + if (actor) + clutter_actor_queue_relayout (actor); - if (G_OBJECT_CLASS (clutter_constraint_parent_class)->notify != NULL) - G_OBJECT_CLASS (clutter_constraint_parent_class)->notify (gobject, pspec); + parent_class->set_enabled (meta, is_enabled); } static void clutter_constraint_class_init (ClutterConstraintClass *klass) { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + ClutterActorMetaClass *actor_meta_class = CLUTTER_ACTOR_META_CLASS (klass); - gobject_class->notify = clutter_constraint_notify; + actor_meta_class->set_enabled = clutter_constraint_set_enabled; klass->update_allocation = constraint_update_allocation; klass->update_preferred_size = constraint_update_preferred_size;