From 0c576c0c339afb2efa6f323461a1cd31650e51e7 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 3 Mar 2011 06:35:46 -0500 Subject: [PATCH] Remove private helper #define's Finish off the second half of 09a830d294. http://bugzilla.clutter-project.org/show_bug.cgi?id=2596 --- clutter/clutter-actor-meta.c | 10 +- clutter/clutter-actor.c | 152 ++++++++++++++-------------- clutter/clutter-align-constraint.c | 6 +- clutter/clutter-alpha.c | 16 +-- clutter/clutter-animation.c | 34 +++---- clutter/clutter-animator.c | 6 +- clutter/clutter-behaviour-ellipse.c | 24 ++--- clutter/clutter-behaviour-opacity.c | 4 +- clutter/clutter-behaviour-path.c | 2 +- clutter/clutter-behaviour-rotate.c | 14 +-- clutter/clutter-behaviour-scale.c | 8 +- clutter/clutter-behaviour.c | 8 +- clutter/clutter-bin-layout.c | 20 ++-- clutter/clutter-bind-constraint.c | 12 +-- clutter/clutter-binding-pool.c | 6 +- clutter/clutter-box.c | 6 +- clutter/clutter-cairo-texture.c | 10 +- clutter/clutter-child-meta.c | 6 +- clutter/clutter-click-action.c | 8 +- clutter/clutter-clone.c | 8 +- clutter/clutter-colorize-effect.c | 8 +- clutter/clutter-deform-effect.c | 10 +- clutter/clutter-desaturate-effect.c | 8 +- clutter/clutter-device-manager.c | 6 +- clutter/clutter-drag-action.c | 14 +-- clutter/clutter-flow-layout.c | 22 ++-- clutter/clutter-page-turn-effect.c | 6 +- clutter/clutter-path-constraint.c | 10 +- clutter/clutter-private.h | 6 -- clutter/clutter-script.c | 6 +- clutter/clutter-shader-effect.c | 6 +- clutter/clutter-shader.c | 10 +- clutter/clutter-snap-constraint.c | 8 +- clutter/clutter-state.c | 2 +- clutter/clutter-text.c | 60 +++++------ clutter/clutter-texture.c | 22 ++-- clutter/clutter-timeline.c | 18 ++-- 37 files changed, 288 insertions(+), 294 deletions(-) diff --git a/clutter/clutter-actor-meta.c b/clutter/clutter-actor-meta.c index 9a6ac5ee7..b17082834 100644 --- a/clutter/clutter-actor-meta.c +++ b/clutter/clutter-actor-meta.c @@ -224,9 +224,9 @@ clutter_actor_meta_class_init (ClutterActorMetaClass *klass) gobject_class->finalize = clutter_actor_meta_finalize; gobject_class->set_property = clutter_actor_meta_set_property; gobject_class->get_property = clutter_actor_meta_get_property; - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); } void @@ -262,7 +262,7 @@ clutter_actor_meta_set_name (ClutterActorMeta *meta, g_free (meta->priv->name); meta->priv->name = g_strdup (name); - _clutter_notify_by_pspec (G_OBJECT (meta), obj_props[PROP_NAME]); + g_object_notify_by_pspec (G_OBJECT (meta), obj_props[PROP_NAME]); } /** @@ -308,7 +308,7 @@ clutter_actor_meta_set_enabled (ClutterActorMeta *meta, meta->priv->is_enabled = is_enabled; - _clutter_notify_by_pspec (G_OBJECT (meta), obj_props[PROP_ENABLED]); + g_object_notify_by_pspec (G_OBJECT (meta), obj_props[PROP_ENABLED]); } /** diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index 8ddb9ff70..b2ea1100e 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -1035,7 +1035,7 @@ clutter_actor_real_map (ClutterActor *self) /* notify on parent mapped before potentially mapping * children, so apps see a top-down notification. */ - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MAPPED]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MAPPED]); for (c = self->priv->children; c; c = c->next) { @@ -1101,7 +1101,7 @@ clutter_actor_real_unmap (ClutterActor *self) /* notify on parent mapped after potentially unmapping * children, so apps see a bottom-up notification. */ - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MAPPED]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MAPPED]); /* relinquish keyboard focus if we were unmapped while owning it */ if (!CLUTTER_ACTOR_IS_TOPLEVEL (self)) @@ -1195,7 +1195,7 @@ set_show_on_set_parent (ClutterActor *self, if (priv->parent_actor == NULL) { priv->show_on_set_parent = set_show; - _clutter_notify_by_pspec (G_OBJECT (self), + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SHOW_ON_SET_PARENT]); } } @@ -1241,7 +1241,7 @@ clutter_actor_show (ClutterActor *self) set_show_on_set_parent (self, TRUE); g_signal_emit (self, actor_signals[SHOW], 0); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_VISIBLE]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_VISIBLE]); if (priv->parent_actor) clutter_actor_queue_redraw (priv->parent_actor); @@ -1334,7 +1334,7 @@ clutter_actor_hide (ClutterActor *self) set_show_on_set_parent (self, FALSE); g_signal_emit (self, actor_signals[HIDE], 0); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_VISIBLE]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_VISIBLE]); if (priv->parent_actor) clutter_actor_queue_redraw (priv->parent_actor); @@ -1425,7 +1425,7 @@ clutter_actor_realize (ClutterActor *self) CLUTTER_NOTE (ACTOR, "Realizing actor '%s'", _clutter_actor_get_debug_name (self)); CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_REALIZED); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_REALIZED]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_REALIZED]); g_signal_emit (self, actor_signals[REALIZE], 0); @@ -1519,7 +1519,7 @@ unrealize_actor_after_children_cb (ClutterActor *self, * child actors are unrealized, to maintain invariants. */ CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_REALIZED); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_REALIZED]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_REALIZED]); return CLUTTER_ACTOR_TRAVERSE_VISIT_CONTINUE; } @@ -1738,15 +1738,15 @@ clutter_actor_notify_if_geometry_changed (ClutterActor *self, */ if (priv->needs_allocation) { - _clutter_notify_by_pspec (obj, obj_props[PROP_X]); - _clutter_notify_by_pspec (obj, obj_props[PROP_Y]); - _clutter_notify_by_pspec (obj, obj_props[PROP_WIDTH]); - _clutter_notify_by_pspec (obj, obj_props[PROP_HEIGHT]); + g_object_notify_by_pspec (obj, obj_props[PROP_X]); + g_object_notify_by_pspec (obj, obj_props[PROP_Y]); + g_object_notify_by_pspec (obj, obj_props[PROP_WIDTH]); + g_object_notify_by_pspec (obj, obj_props[PROP_HEIGHT]); } else if (priv->needs_width_request || priv->needs_height_request) { - _clutter_notify_by_pspec (obj, obj_props[PROP_WIDTH]); - _clutter_notify_by_pspec (obj, obj_props[PROP_HEIGHT]); + g_object_notify_by_pspec (obj, obj_props[PROP_WIDTH]); + g_object_notify_by_pspec (obj, obj_props[PROP_HEIGHT]); } else { @@ -1759,16 +1759,16 @@ clutter_actor_notify_if_geometry_changed (ClutterActor *self, heightu = priv->allocation.y2 - priv->allocation.y1; if (xu != old->x1) - _clutter_notify_by_pspec (obj, obj_props[PROP_X]); + g_object_notify_by_pspec (obj, obj_props[PROP_X]); if (yu != old->y1) - _clutter_notify_by_pspec (obj, obj_props[PROP_Y]); + g_object_notify_by_pspec (obj, obj_props[PROP_Y]); if (widthu != (old->x2 - old->x1)) - _clutter_notify_by_pspec (obj, obj_props[PROP_WIDTH]); + g_object_notify_by_pspec (obj, obj_props[PROP_WIDTH]); if (heightu != (old->y2 - old->y1)) - _clutter_notify_by_pspec (obj, obj_props[PROP_HEIGHT]); + g_object_notify_by_pspec (obj, obj_props[PROP_HEIGHT]); } g_object_thaw_notify (obj); @@ -1804,7 +1804,7 @@ clutter_actor_real_allocate (ClutterActor *self, CLUTTER_NOTE (LAYOUT, "Allocation for '%s' changed", _clutter_actor_get_debug_name (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ALLOCATION]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ALLOCATION]); /* we also emit the ::allocation-changed signal for people * that wish to track the allocation flags @@ -2742,17 +2742,17 @@ clutter_actor_set_rotation_internal (ClutterActor *self, { case CLUTTER_X_AXIS: priv->rxang = angle; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_ANGLE_X]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_ANGLE_X]); break; case CLUTTER_Y_AXIS: priv->ryang = angle; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_ANGLE_Y]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_ANGLE_Y]); break; case CLUTTER_Z_AXIS: priv->rzang = angle; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_ANGLE_Z]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_ANGLE_Z]); break; } @@ -5911,7 +5911,7 @@ clutter_actor_set_fixed_position_set (ClutterActor *self, return; self->priv->position_set = is_set != FALSE; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FIXED_POSITION_SET]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FIXED_POSITION_SET]); clutter_actor_queue_relayout (self); } @@ -5973,7 +5973,7 @@ clutter_actor_set_min_width (ClutterActor *self, clutter_actor_store_old_geometry (self, &old); priv->request_min_width = min_width; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MIN_WIDTH]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MIN_WIDTH]); clutter_actor_set_min_width_set (self, TRUE); clutter_actor_notify_if_geometry_changed (self, &old); @@ -6008,7 +6008,7 @@ clutter_actor_set_min_height (ClutterActor *self, clutter_actor_store_old_geometry (self, &old); priv->request_min_height = min_height; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MIN_HEIGHT]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MIN_HEIGHT]); clutter_actor_set_min_height_set (self, TRUE); clutter_actor_notify_if_geometry_changed (self, &old); @@ -6043,7 +6043,7 @@ clutter_actor_set_natural_width (ClutterActor *self, clutter_actor_store_old_geometry (self, &old); priv->request_natural_width = natural_width; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_NATURAL_WIDTH]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_NATURAL_WIDTH]); clutter_actor_set_natural_width_set (self, TRUE); clutter_actor_notify_if_geometry_changed (self, &old); @@ -6078,7 +6078,7 @@ clutter_actor_set_natural_height (ClutterActor *self, clutter_actor_store_old_geometry (self, &old); priv->request_natural_height = natural_height; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_NATURAL_HEIGHT]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_NATURAL_HEIGHT]); clutter_actor_set_natural_height_set (self, TRUE); clutter_actor_notify_if_geometry_changed (self, &old); @@ -6101,7 +6101,7 @@ clutter_actor_set_min_width_set (ClutterActor *self, clutter_actor_store_old_geometry (self, &old); priv->min_width_set = use_min_width != FALSE; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MIN_WIDTH_SET]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MIN_WIDTH_SET]); clutter_actor_notify_if_geometry_changed (self, &old); @@ -6121,7 +6121,7 @@ clutter_actor_set_min_height_set (ClutterActor *self, clutter_actor_store_old_geometry (self, &old); priv->min_height_set = use_min_height != FALSE; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MIN_HEIGHT_SET]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MIN_HEIGHT_SET]); clutter_actor_notify_if_geometry_changed (self, &old); @@ -6141,7 +6141,7 @@ clutter_actor_set_natural_width_set (ClutterActor *self, clutter_actor_store_old_geometry (self, &old); priv->natural_width_set = use_natural_width != FALSE; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_NATURAL_WIDTH_SET]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_NATURAL_WIDTH_SET]); clutter_actor_notify_if_geometry_changed (self, &old); @@ -6161,7 +6161,7 @@ clutter_actor_set_natural_height_set (ClutterActor *self, clutter_actor_store_old_geometry (self, &old); priv->natural_height_set = use_natural_height != FALSE; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_NATURAL_HEIGHT_SET]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_NATURAL_HEIGHT_SET]); clutter_actor_notify_if_geometry_changed (self, &old); @@ -6199,7 +6199,7 @@ clutter_actor_set_request_mode (ClutterActor *self, priv->needs_width_request = TRUE; priv->needs_height_request = TRUE; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_REQUEST_MODE]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_REQUEST_MODE]); clutter_actor_queue_relayout (self); } @@ -6843,10 +6843,10 @@ clutter_actor_set_scale (ClutterActor *self, g_object_freeze_notify (G_OBJECT (self)); priv->scale_x = scale_x; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_X]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_X]); priv->scale_y = scale_y; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_Y]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_Y]); clutter_actor_queue_redraw (self); @@ -6885,10 +6885,10 @@ clutter_actor_set_scale_full (ClutterActor *self, clutter_actor_set_scale (self, scale_x, scale_y); if (priv->scale_center.is_fractional) - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_GRAVITY]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_GRAVITY]); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_CENTER_X]); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_CENTER_Y]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_CENTER_X]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_CENTER_Y]); clutter_anchor_coord_set_units (&priv->scale_center, center_x, center_y, 0); @@ -6931,9 +6931,9 @@ clutter_actor_set_scale_with_gravity (ClutterActor *self, clutter_actor_set_scale (self, scale_x, scale_y); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_GRAVITY]); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_CENTER_X]); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_CENTER_Y]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_GRAVITY]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_CENTER_X]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SCALE_CENTER_Y]); clutter_anchor_coord_set_gravity (&priv->scale_center, gravity); @@ -7039,7 +7039,7 @@ clutter_actor_set_opacity (ClutterActor *self, clutter_actor_queue_redraw (self); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_OPACITY]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_OPACITY]); } } @@ -7145,7 +7145,7 @@ clutter_actor_set_name (ClutterActor *self, g_free (self->priv->name); self->priv->name = g_strdup (name); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_NAME]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_NAME]); } /** @@ -7224,7 +7224,7 @@ clutter_actor_set_depth (ClutterActor *self, clutter_actor_queue_redraw (self); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_DEPTH]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_DEPTH]); } } @@ -7290,19 +7290,19 @@ clutter_actor_set_rotation (ClutterActor *self, { case CLUTTER_X_AXIS: clutter_anchor_coord_set_units (&priv->rx_center, x, y, z); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_CENTER_X]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_CENTER_X]); break; case CLUTTER_Y_AXIS: clutter_anchor_coord_set_units (&priv->ry_center, x, y, z); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_CENTER_Y]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_CENTER_Y]); break; case CLUTTER_Z_AXIS: if (priv->rz_center.is_fractional) - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_CENTER_Z_GRAVITY]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_CENTER_Z_GRAVITY]); clutter_anchor_coord_set_units (&priv->rz_center, x, y, z); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_CENTER_Z]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_CENTER_Z]); break; } @@ -7343,8 +7343,8 @@ clutter_actor_set_z_rotation_from_gravity (ClutterActor *self, clutter_actor_set_rotation_internal (self, CLUTTER_Z_AXIS, angle); clutter_anchor_coord_set_gravity (&priv->rz_center, gravity); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_CENTER_Z_GRAVITY]); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_CENTER_Z]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_CENTER_Z_GRAVITY]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ROTATION_CENTER_Z]); g_object_thaw_notify (G_OBJECT (self)); } @@ -7466,8 +7466,8 @@ clutter_actor_set_clip (ClutterActor *self, clutter_actor_queue_redraw (self); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_HAS_CLIP]); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CLIP]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_HAS_CLIP]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CLIP]); } /** @@ -7488,7 +7488,7 @@ clutter_actor_remove_clip (ClutterActor *self) clutter_actor_queue_redraw (self); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_HAS_CLIP]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_HAS_CLIP]); } /** @@ -8116,7 +8116,7 @@ clutter_actor_set_reactive (ClutterActor *actor, else CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REACTIVE); - _clutter_notify_by_pspec (G_OBJECT (actor), obj_props[PROP_REACTIVE]); + g_object_notify_by_pspec (G_OBJECT (actor), obj_props[PROP_REACTIVE]); } /** @@ -8198,17 +8198,17 @@ clutter_actor_set_anchor_point (ClutterActor *self, NULL); if (priv->anchor.is_fractional) - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANCHOR_GRAVITY]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANCHOR_GRAVITY]); if (old_anchor_x != anchor_x) { - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANCHOR_X]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANCHOR_X]); changed = TRUE; } if (old_anchor_y != anchor_y) { - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANCHOR_Y]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANCHOR_Y]); changed = TRUE; } @@ -8360,9 +8360,9 @@ clutter_actor_set_anchor_point_from_gravity (ClutterActor *self, { clutter_anchor_coord_set_gravity (&self->priv->anchor, gravity); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANCHOR_GRAVITY]); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANCHOR_X]); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANCHOR_Y]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANCHOR_GRAVITY]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANCHOR_X]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANCHOR_Y]); } } @@ -10458,16 +10458,16 @@ clutter_actor_set_flags (ClutterActor *self, visible_set = ((self->flags & CLUTTER_ACTOR_VISIBLE) != 0); if (reactive_set != was_reactive_set) - _clutter_notify_by_pspec (obj, obj_props[PROP_REACTIVE]); + g_object_notify_by_pspec (obj, obj_props[PROP_REACTIVE]); if (realized_set != was_realized_set) - _clutter_notify_by_pspec (obj, obj_props[PROP_REALIZED]); + g_object_notify_by_pspec (obj, obj_props[PROP_REALIZED]); if (mapped_set != was_mapped_set) - _clutter_notify_by_pspec (obj, obj_props[PROP_MAPPED]); + g_object_notify_by_pspec (obj, obj_props[PROP_MAPPED]); if (visible_set != was_visible_set) - _clutter_notify_by_pspec (obj, obj_props[PROP_VISIBLE]); + g_object_notify_by_pspec (obj, obj_props[PROP_VISIBLE]); g_object_thaw_notify (obj); g_object_unref (obj); @@ -10518,16 +10518,16 @@ clutter_actor_unset_flags (ClutterActor *self, visible_set = ((self->flags & CLUTTER_ACTOR_VISIBLE) != 0); if (reactive_set != was_reactive_set) - _clutter_notify_by_pspec (obj, obj_props[PROP_REACTIVE]); + g_object_notify_by_pspec (obj, obj_props[PROP_REACTIVE]); if (realized_set != was_realized_set) - _clutter_notify_by_pspec (obj, obj_props[PROP_REALIZED]); + g_object_notify_by_pspec (obj, obj_props[PROP_REALIZED]); if (mapped_set != was_mapped_set) - _clutter_notify_by_pspec (obj, obj_props[PROP_MAPPED]); + g_object_notify_by_pspec (obj, obj_props[PROP_MAPPED]); if (visible_set != was_visible_set) - _clutter_notify_by_pspec (obj, obj_props[PROP_VISIBLE]); + g_object_notify_by_pspec (obj, obj_props[PROP_VISIBLE]); g_object_thaw_notify (obj); } @@ -10633,7 +10633,7 @@ clutter_actor_set_text_direction (ClutterActor *self, * the text direction; see clutter_text_direction_changed_cb() * inside clutter-text.c */ - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_TEXT_DIRECTION]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_TEXT_DIRECTION]); /* if this is a container we need to recurse */ if (CLUTTER_IS_CONTAINER (self)) @@ -10659,7 +10659,7 @@ _clutter_actor_set_has_pointer (ClutterActor *self, { priv->has_pointer = has_pointer; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_HAS_POINTER]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_HAS_POINTER]); } } @@ -10884,7 +10884,7 @@ clutter_actor_add_action (ClutterActor *self, _clutter_meta_group_add_meta (priv->actions, CLUTTER_ACTOR_META (action)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ACTIONS]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ACTIONS]); } /** @@ -10945,7 +10945,7 @@ clutter_actor_remove_action (ClutterActor *self, _clutter_meta_group_remove_meta (priv->actions, CLUTTER_ACTOR_META (action)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ACTIONS]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ACTIONS]); } /** @@ -10979,7 +10979,7 @@ clutter_actor_remove_action_by_name (ClutterActor *self, _clutter_meta_group_remove_meta (priv->actions, meta); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ACTIONS]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ACTIONS]); } /** @@ -11091,7 +11091,7 @@ clutter_actor_add_constraint (ClutterActor *self, CLUTTER_ACTOR_META (constraint)); clutter_actor_queue_relayout (self); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CONSTRAINTS]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CONSTRAINTS]); } /** @@ -11154,7 +11154,7 @@ clutter_actor_remove_constraint (ClutterActor *self, CLUTTER_ACTOR_META (constraint)); clutter_actor_queue_relayout (self); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CONSTRAINTS]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CONSTRAINTS]); } /** @@ -11292,7 +11292,7 @@ clutter_actor_set_clip_to_allocation (ClutterActor *self, clutter_actor_queue_redraw (self); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CLIP_TO_ALLOCATION]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CLIP_TO_ALLOCATION]); } } @@ -11348,7 +11348,7 @@ clutter_actor_add_effect (ClutterActor *self, clutter_actor_queue_redraw (self); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_EFFECT]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_EFFECT]); } /** @@ -11411,7 +11411,7 @@ clutter_actor_remove_effect (ClutterActor *self, clutter_actor_queue_redraw (self); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_EFFECT]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_EFFECT]); } /** diff --git a/clutter/clutter-align-constraint.c b/clutter/clutter-align-constraint.c index 5951b333e..da35c9992 100644 --- a/clutter/clutter-align-constraint.c +++ b/clutter/clutter-align-constraint.c @@ -379,7 +379,7 @@ clutter_align_constraint_set_source (ClutterAlignConstraint *align, clutter_actor_queue_relayout (align->actor); } - _clutter_notify_by_pspec (G_OBJECT (align), obj_props[PROP_SOURCE]); + g_object_notify_by_pspec (G_OBJECT (align), obj_props[PROP_SOURCE]); } /** @@ -424,7 +424,7 @@ clutter_align_constraint_set_align_axis (ClutterAlignConstraint *align, if (align->actor != NULL) clutter_actor_queue_relayout (align->actor); - _clutter_notify_by_pspec (G_OBJECT (align), obj_props[PROP_ALIGN_AXIS]); + g_object_notify_by_pspec (G_OBJECT (align), obj_props[PROP_ALIGN_AXIS]); } /** @@ -476,7 +476,7 @@ clutter_align_constraint_set_factor (ClutterAlignConstraint *align, if (align->actor != NULL) clutter_actor_queue_relayout (align->actor); - _clutter_notify_by_pspec (G_OBJECT (align), obj_props[PROP_FACTOR]); + g_object_notify_by_pspec (G_OBJECT (align), obj_props[PROP_FACTOR]); } /** diff --git a/clutter/clutter-alpha.c b/clutter/clutter-alpha.c index 262837333..e41adef68 100644 --- a/clutter/clutter-alpha.c +++ b/clutter/clutter-alpha.c @@ -156,7 +156,7 @@ timeline_new_frame_cb (ClutterTimeline *timeline, /* Update alpha value and notify */ priv->alpha = clutter_alpha_get_alpha (alpha); - _clutter_notify_by_pspec (G_OBJECT (alpha), obj_props[PROP_ALPHA]); + g_object_notify_by_pspec (G_OBJECT (alpha), obj_props[PROP_ALPHA]); } static void @@ -379,9 +379,9 @@ clutter_alpha_class_init (ClutterAlphaClass *klass) CLUTTER_CUSTOM_MODE, G_PARAM_CONSTRUCT | CLUTTER_PARAM_READWRITE); - _clutter_object_class_install_properties (object_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (object_class, + PROP_LAST, + obj_props); } static void @@ -495,7 +495,7 @@ clutter_alpha_set_closure (ClutterAlpha *alpha, clutter_alpha_set_closure_internal (alpha, closure); priv->mode = CLUTTER_CUSTOM_MODE; - _clutter_notify_by_pspec (G_OBJECT (alpha), obj_props[PROP_MODE]); + g_object_notify_by_pspec (G_OBJECT (alpha), obj_props[PROP_MODE]); } /** @@ -531,7 +531,7 @@ clutter_alpha_set_func (ClutterAlpha *alpha, clutter_alpha_set_closure_internal (alpha, closure); priv->mode = CLUTTER_CUSTOM_MODE; - _clutter_notify_by_pspec (G_OBJECT (alpha), obj_props[PROP_MODE]); + g_object_notify_by_pspec (G_OBJECT (alpha), obj_props[PROP_MODE]); } /** @@ -576,7 +576,7 @@ clutter_alpha_set_timeline (ClutterAlpha *alpha, alpha); } - _clutter_notify_by_pspec (G_OBJECT (alpha), obj_props[PROP_TIMELINE]); + g_object_notify_by_pspec (G_OBJECT (alpha), obj_props[PROP_TIMELINE]); } /** @@ -1298,7 +1298,7 @@ clutter_alpha_set_mode (ClutterAlpha *alpha, else g_assert_not_reached (); - _clutter_notify_by_pspec (G_OBJECT (alpha), obj_props[PROP_MODE]); + g_object_notify_by_pspec (G_OBJECT (alpha), obj_props[PROP_MODE]); } static gulong diff --git a/clutter/clutter-animation.c b/clutter/clutter-animation.c index f357a0617..eba454aed 100644 --- a/clutter/clutter-animation.c +++ b/clutter/clutter-animation.c @@ -539,9 +539,9 @@ clutter_animation_class_init (ClutterAnimationClass *klass) CLUTTER_TYPE_ALPHA, CLUTTER_PARAM_READWRITE); - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); /** * ClutterAnimation::started: @@ -1154,7 +1154,7 @@ clutter_animation_get_alpha_internal (ClutterAnimation *animation) priv->alpha = g_object_ref_sink (alpha); - _clutter_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_ALPHA]); + g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_ALPHA]); } return priv->alpha; @@ -1189,7 +1189,7 @@ clutter_animation_get_timeline_internal (ClutterAnimation *animation) /* the alpha owns the timeline now */ g_object_unref (timeline); - _clutter_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_TIMELINE]); + g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_TIMELINE]); return timeline; } @@ -1254,7 +1254,7 @@ clutter_animation_set_object (ClutterAnimation *animation, if (object != NULL) priv->object = g_object_ref (object); - _clutter_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_OBJECT]); + g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_OBJECT]); } /** @@ -1303,7 +1303,7 @@ clutter_animation_set_mode (ClutterAnimation *animation, clutter_alpha_set_mode (alpha, mode); - _clutter_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_MODE]); + g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_MODE]); g_object_thaw_notify (G_OBJECT (animation)); } @@ -1359,7 +1359,7 @@ clutter_animation_set_duration (ClutterAnimation *animation, clutter_timeline_set_duration (timeline, msecs); clutter_timeline_rewind (timeline); - _clutter_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_DURATION]); + g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_DURATION]); g_object_thaw_notify (G_OBJECT (animation)); } @@ -1392,7 +1392,7 @@ clutter_animation_set_loop (ClutterAnimation *animation, timeline = clutter_animation_get_timeline_internal (animation); clutter_timeline_set_loop (timeline, loop); - _clutter_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_LOOP]); + g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_LOOP]); g_object_thaw_notify (G_OBJECT (animation)); } @@ -1485,9 +1485,9 @@ clutter_animation_set_timeline (ClutterAnimation *animation, alpha = clutter_animation_get_alpha_internal (animation); clutter_alpha_set_timeline (alpha, timeline); - _clutter_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_TIMELINE]); - _clutter_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_DURATION]); - _clutter_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_LOOP]); + g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_TIMELINE]); + g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_DURATION]); + g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_LOOP]); if (timeline) { @@ -1615,11 +1615,11 @@ clutter_animation_set_alpha (ClutterAnimation *animation, out: /* emit all relevant notifications */ - _clutter_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_MODE]); - _clutter_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_DURATION]); - _clutter_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_LOOP]); - _clutter_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_ALPHA]); - _clutter_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_TIMELINE]); + g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_MODE]); + g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_DURATION]); + g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_LOOP]); + g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_ALPHA]); + g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_TIMELINE]); g_object_thaw_notify (G_OBJECT (animation)); } diff --git a/clutter/clutter-animator.c b/clutter/clutter-animator.c index 0ba707cc6..15f19febc 100644 --- a/clutter/clutter-animator.c +++ b/clutter/clutter-animator.c @@ -1804,9 +1804,9 @@ clutter_animator_class_init (ClutterAnimatorClass *klass) CLUTTER_TYPE_TIMELINE, CLUTTER_PARAM_READWRITE); - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); } static void diff --git a/clutter/clutter-behaviour-ellipse.c b/clutter/clutter-behaviour-ellipse.c index 2502215df..5f2c779c8 100644 --- a/clutter/clutter-behaviour-ellipse.c +++ b/clutter/clutter-behaviour-ellipse.c @@ -627,7 +627,7 @@ clutter_behaviour_ellipse_set_center (ClutterBehaviourEllipse *self, priv->center.x = x; priv->center.y = y; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CENTER]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CENTER]); } } @@ -683,7 +683,7 @@ clutter_behaviour_ellipse_set_width (ClutterBehaviourEllipse *self, { priv->a = width / 2; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_WIDTH]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_WIDTH]); } } @@ -728,7 +728,7 @@ clutter_behaviour_ellipse_set_height (ClutterBehaviourEllipse *self, { priv->b = height / 2; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_HEIGHT]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_HEIGHT]); } } @@ -776,7 +776,7 @@ clutter_behaviour_ellipse_set_angle_start (ClutterBehaviourEllipse *self, if (priv->angle_start != new_angle) { priv->angle_start = new_angle; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_START]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_START]); } } @@ -825,7 +825,7 @@ clutter_behaviour_ellipse_set_angle_end (ClutterBehaviourEllipse *self, { priv->angle_end = new_angle; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_END]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_END]); } } @@ -876,7 +876,7 @@ clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self, { priv->angle_tilt_x = angle_tilt; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_TILT_X]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_TILT_X]); } break; @@ -885,7 +885,7 @@ clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self, { priv->angle_tilt_y = angle_tilt; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_TILT_Y]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_TILT_Y]); } break; @@ -894,7 +894,7 @@ clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self, { priv->angle_tilt_z = angle_tilt; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_TILT_Z]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_TILT_Z]); } break; } @@ -961,21 +961,21 @@ clutter_behaviour_ellipse_set_tilt (ClutterBehaviourEllipse *self, { priv->angle_tilt_x = angle_tilt_x; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_TILT_X]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_TILT_X]); } if (priv->angle_tilt_y != angle_tilt_y) { priv->angle_tilt_y = angle_tilt_y; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_TILT_Y]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_TILT_Y]); } if (priv->angle_tilt_z != angle_tilt_z) { priv->angle_tilt_z = angle_tilt_z; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_TILT_Z]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ANGLE_TILT_Z]); } g_object_thaw_notify (G_OBJECT (self)); @@ -1056,6 +1056,6 @@ clutter_behaviour_ellipse_set_direction (ClutterBehaviourEllipse *self, { priv->direction = direction; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_DIRECTION]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_DIRECTION]); } } diff --git a/clutter/clutter-behaviour-opacity.c b/clutter/clutter-behaviour-opacity.c index 46dd8388d..e322c67d1 100644 --- a/clutter/clutter-behaviour-opacity.c +++ b/clutter/clutter-behaviour-opacity.c @@ -274,14 +274,14 @@ clutter_behaviour_opacity_set_bounds (ClutterBehaviourOpacity *behaviour, { priv->opacity_start = opacity_start; - _clutter_notify_by_pspec (G_OBJECT (behaviour), obj_props[PROP_OPACITY_START]); + g_object_notify_by_pspec (G_OBJECT (behaviour), obj_props[PROP_OPACITY_START]); } if (priv->opacity_end != opacity_end) { priv->opacity_end = opacity_end; - _clutter_notify_by_pspec (G_OBJECT (behaviour), obj_props[PROP_OPACITY_END]); + g_object_notify_by_pspec (G_OBJECT (behaviour), obj_props[PROP_OPACITY_END]); } g_object_thaw_notify (G_OBJECT (behaviour)); diff --git a/clutter/clutter-behaviour-path.c b/clutter/clutter-behaviour-path.c index 29ca9ece1..4c9214034 100644 --- a/clutter/clutter-behaviour-path.c +++ b/clutter/clutter-behaviour-path.c @@ -447,7 +447,7 @@ clutter_behaviour_path_set_path (ClutterBehaviourPath *pathb, priv->path = path; - _clutter_notify_by_pspec (G_OBJECT (pathb), obj_props[PROP_PATH]); + g_object_notify_by_pspec (G_OBJECT (pathb), obj_props[PROP_PATH]); } /** diff --git a/clutter/clutter-behaviour-rotate.c b/clutter/clutter-behaviour-rotate.c index a149c68e7..c38dc1800 100644 --- a/clutter/clutter-behaviour-rotate.c +++ b/clutter/clutter-behaviour-rotate.c @@ -488,7 +488,7 @@ clutter_behaviour_rotate_set_axis (ClutterBehaviourRotate *rotate, { priv->axis = axis; - _clutter_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_AXIS]); + g_object_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_AXIS]); } } @@ -534,7 +534,7 @@ clutter_behaviour_rotate_set_direction (ClutterBehaviourRotate *rotate, { priv->direction = direction; - _clutter_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_DIRECTION]); + g_object_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_DIRECTION]); } } @@ -594,14 +594,14 @@ clutter_behaviour_rotate_set_bounds (ClutterBehaviourRotate *rotate, { priv->angle_start = clamp_angle (angle_start); - _clutter_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_ANGLE_START]); + g_object_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_ANGLE_START]); } if (priv->angle_end != angle_end) { priv->angle_end = clamp_angle (angle_end); - _clutter_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_ANGLE_END]); + g_object_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_ANGLE_END]); } g_object_thaw_notify (G_OBJECT (rotate)); @@ -636,19 +636,19 @@ clutter_behaviour_rotate_set_center (ClutterBehaviourRotate *rotate, if (priv->center_x != x) { priv->center_x = x; - _clutter_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_CENTER_X]); + g_object_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_CENTER_X]); } if (priv->center_y != y) { priv->center_y = y; - _clutter_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_CENTER_Y]); + g_object_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_CENTER_Y]); } if (priv->center_z != z) { priv->center_z = z; - _clutter_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_CENTER_Z]); + g_object_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_CENTER_Z]); } g_object_thaw_notify (G_OBJECT (rotate)); diff --git a/clutter/clutter-behaviour-scale.c b/clutter/clutter-behaviour-scale.c index 0c0ebc345..6d21a3e98 100644 --- a/clutter/clutter-behaviour-scale.c +++ b/clutter/clutter-behaviour-scale.c @@ -366,25 +366,25 @@ clutter_behaviour_scale_set_bounds (ClutterBehaviourScale *scale, if (priv->x_scale_start != x_scale_start) { priv->x_scale_start = x_scale_start; - _clutter_notify_by_pspec (G_OBJECT (scale), obj_props[PROP_X_SCALE_START]); + g_object_notify_by_pspec (G_OBJECT (scale), obj_props[PROP_X_SCALE_START]); } if (priv->y_scale_start != y_scale_start) { priv->y_scale_start = y_scale_start; - _clutter_notify_by_pspec (G_OBJECT (scale), obj_props[PROP_Y_SCALE_START]); + g_object_notify_by_pspec (G_OBJECT (scale), obj_props[PROP_Y_SCALE_START]); } if (priv->x_scale_end != x_scale_end) { priv->x_scale_end = x_scale_end; - _clutter_notify_by_pspec (G_OBJECT (scale), obj_props[PROP_X_SCALE_END]); + g_object_notify_by_pspec (G_OBJECT (scale), obj_props[PROP_X_SCALE_END]); } if (priv->y_scale_end != y_scale_end) { priv->y_scale_end = y_scale_end; - _clutter_notify_by_pspec (G_OBJECT (scale), obj_props[PROP_Y_SCALE_END]); + g_object_notify_by_pspec (G_OBJECT (scale), obj_props[PROP_Y_SCALE_END]); } g_object_thaw_notify (G_OBJECT (scale)); diff --git a/clutter/clutter-behaviour.c b/clutter/clutter-behaviour.c index 357151767..300b3cb09 100644 --- a/clutter/clutter-behaviour.c +++ b/clutter/clutter-behaviour.c @@ -300,9 +300,9 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass) CLUTTER_TYPE_ALPHA, CLUTTER_PARAM_READWRITE); - _clutter_object_class_install_properties (object_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (object_class, + PROP_LAST, + obj_props); klass->alpha_notify = clutter_behaviour_alpha_notify_unimplemented; @@ -636,7 +636,7 @@ clutter_behaviour_set_alpha (ClutterBehaviour *behave, priv->alpha, priv->notify_id); } - _clutter_notify_by_pspec (G_OBJECT (behave), obj_props[PROP_ALPHA]); + g_object_notify_by_pspec (G_OBJECT (behave), obj_props[PROP_ALPHA]); } /** diff --git a/clutter/clutter-bin-layout.c b/clutter/clutter-bin-layout.c index ab0238658..f00a8c16f 100644 --- a/clutter/clutter-bin-layout.c +++ b/clutter/clutter-bin-layout.c @@ -178,7 +178,7 @@ set_layer_x_align (ClutterBinLayer *self, manager = clutter_layout_meta_get_manager (meta); clutter_layout_manager_layout_changed (manager); - _clutter_notify_by_pspec (G_OBJECT (self), layer_props[PROP_LAYER_X_ALIGN]); + g_object_notify_by_pspec (G_OBJECT (self), layer_props[PROP_LAYER_X_ALIGN]); } static void @@ -197,7 +197,7 @@ set_layer_y_align (ClutterBinLayer *self, manager = clutter_layout_meta_get_manager (meta); clutter_layout_manager_layout_changed (manager); - _clutter_notify_by_pspec (G_OBJECT (self), layer_props[PROP_LAYER_Y_ALIGN]); + g_object_notify_by_pspec (G_OBJECT (self), layer_props[PROP_LAYER_Y_ALIGN]); } static void @@ -274,9 +274,9 @@ clutter_bin_layer_class_init (ClutterBinLayerClass *klass) CLUTTER_BIN_ALIGNMENT_CENTER, CLUTTER_PARAM_READWRITE); - _clutter_object_class_install_properties (gobject_class, - PROP_LAYER_LAST, - layer_props); + g_object_class_install_properties (gobject_class, + PROP_LAYER_LAST, + layer_props); } static void @@ -305,7 +305,7 @@ set_x_align (ClutterBinLayout *self, manager = CLUTTER_LAYOUT_MANAGER (self); clutter_layout_manager_layout_changed (manager); - _clutter_notify_by_pspec (G_OBJECT (self), bin_props[PROP_X_ALIGN]); + g_object_notify_by_pspec (G_OBJECT (self), bin_props[PROP_X_ALIGN]); } } @@ -324,7 +324,7 @@ set_y_align (ClutterBinLayout *self, manager = CLUTTER_LAYOUT_MANAGER (self); clutter_layout_manager_layout_changed (manager); - _clutter_notify_by_pspec (G_OBJECT (self), bin_props[PROP_Y_ALIGN]); + g_object_notify_by_pspec (G_OBJECT (self), bin_props[PROP_Y_ALIGN]); } } @@ -603,9 +603,9 @@ clutter_bin_layout_class_init (ClutterBinLayoutClass *klass) gobject_class->set_property = clutter_bin_layout_set_property; gobject_class->get_property = clutter_bin_layout_get_property; - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - bin_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + bin_props); layout_class->get_preferred_width = clutter_bin_layout_get_preferred_width; diff --git a/clutter/clutter-bind-constraint.c b/clutter/clutter-bind-constraint.c index 984aed334..472562ee4 100644 --- a/clutter/clutter-bind-constraint.c +++ b/clutter/clutter-bind-constraint.c @@ -348,9 +348,9 @@ clutter_bind_constraint_class_init (ClutterBindConstraintClass *klass) 0.0f, CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT); - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); } static void @@ -436,7 +436,7 @@ clutter_bind_constraint_set_source (ClutterBindConstraint *constraint, clutter_actor_queue_relayout (constraint->actor); } - _clutter_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_SOURCE]); + g_object_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_SOURCE]); } /** @@ -480,7 +480,7 @@ clutter_bind_constraint_set_coordinate (ClutterBindConstraint *constraint, if (constraint->actor != NULL) clutter_actor_queue_relayout (constraint->actor); - _clutter_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_COORDINATE]); + g_object_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_COORDINATE]); } /** @@ -525,7 +525,7 @@ clutter_bind_constraint_set_offset (ClutterBindConstraint *constraint, if (constraint->actor != NULL) clutter_actor_queue_relayout (constraint->actor); - _clutter_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_OFFSET]); + g_object_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_OFFSET]); } /** diff --git a/clutter/clutter-binding-pool.c b/clutter/clutter-binding-pool.c index 11fbf18e0..689977f99 100644 --- a/clutter/clutter-binding-pool.c +++ b/clutter/clutter-binding-pool.c @@ -322,9 +322,9 @@ clutter_binding_pool_class_init (ClutterBindingPoolClass *klass) CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); } static void diff --git a/clutter/clutter-box.c b/clutter/clutter-box.c index 659d1fbff..2aef12100 100644 --- a/clutter/clutter-box.c +++ b/clutter/clutter-box.c @@ -409,7 +409,7 @@ set_layout_manager (ClutterBox *self, clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LAYOUT_MANAGER]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LAYOUT_MANAGER]); } static void @@ -983,8 +983,8 @@ clutter_box_set_color (ClutterBox *box, clutter_actor_queue_redraw (CLUTTER_ACTOR (box)); - _clutter_notify_by_pspec (G_OBJECT (box), obj_props[PROP_COLOR_SET]); - _clutter_notify_by_pspec (G_OBJECT (box), obj_props[PROP_COLOR]); + g_object_notify_by_pspec (G_OBJECT (box), obj_props[PROP_COLOR_SET]); + g_object_notify_by_pspec (G_OBJECT (box), obj_props[PROP_COLOR]); } /** diff --git a/clutter/clutter-cairo-texture.c b/clutter/clutter-cairo-texture.c index fb57f2b60..7931c055a 100644 --- a/clutter/clutter-cairo-texture.c +++ b/clutter/clutter-cairo-texture.c @@ -431,9 +431,9 @@ clutter_cairo_texture_class_init (ClutterCairoTextureClass *klass) 0, CLUTTER_PARAM_READWRITE); - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); /** * ClutterCairoTexture::create-surface: @@ -767,13 +767,13 @@ clutter_cairo_texture_set_surface_size (ClutterCairoTexture *self, if (priv->width != width) { priv->width = width; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SURFACE_WIDTH]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SURFACE_WIDTH]); } if (priv->height != height) { priv->height = height; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SURFACE_HEIGHT]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SURFACE_HEIGHT]); } clutter_cairo_texture_surface_resize_internal (self); diff --git a/clutter/clutter-child-meta.c b/clutter/clutter-child-meta.c index c272f5b3f..aeabd2ff7 100644 --- a/clutter/clutter-child-meta.c +++ b/clutter/clutter-child-meta.c @@ -145,9 +145,9 @@ clutter_child_meta_class_init (ClutterChildMetaClass *klass) G_PARAM_CONSTRUCT_ONLY | CLUTTER_PARAM_READWRITE); - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); } static void diff --git a/clutter/clutter-click-action.c b/clutter/clutter-click-action.c index d3dad3a8f..e93deb3f4 100644 --- a/clutter/clutter-click-action.c +++ b/clutter/clutter-click-action.c @@ -111,7 +111,7 @@ click_action_set_pressed (ClutterClickAction *action, return; priv->is_pressed = is_pressed; - _clutter_notify_by_pspec (G_OBJECT (action), obj_props[PROP_PRESSED]); + g_object_notify_by_pspec (G_OBJECT (action), obj_props[PROP_PRESSED]); } static gboolean @@ -318,9 +318,9 @@ clutter_click_action_class_init (ClutterClickActionClass *klass) FALSE, CLUTTER_PARAM_READABLE); - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); /** * ClutterClickAction::clicked: diff --git a/clutter/clutter-clone.c b/clutter/clutter-clone.c index b1bc7f607..b1812d5a7 100644 --- a/clutter/clutter-clone.c +++ b/clutter/clutter-clone.c @@ -329,9 +329,9 @@ clutter_clone_class_init (ClutterCloneClass *klass) G_PARAM_CONSTRUCT | CLUTTER_PARAM_READWRITE); - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); } static void @@ -402,7 +402,7 @@ clutter_clone_set_source_internal (ClutterClone *clone, G_CALLBACK (clone_source_queue_relayout_cb), clone); } - _clutter_notify_by_pspec (G_OBJECT (clone), obj_props[PROP_SOURCE]); + g_object_notify_by_pspec (G_OBJECT (clone), obj_props[PROP_SOURCE]); clutter_actor_queue_relayout (CLUTTER_ACTOR (clone)); } diff --git a/clutter/clutter-colorize-effect.c b/clutter/clutter-colorize-effect.c index d96d0040c..f59a07710 100644 --- a/clutter/clutter-colorize-effect.c +++ b/clutter/clutter-colorize-effect.c @@ -309,9 +309,9 @@ clutter_colorize_effect_class_init (ClutterColorizeEffectClass *klass) &default_tint, CLUTTER_PARAM_READWRITE); - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); } static void @@ -359,7 +359,7 @@ clutter_colorize_effect_set_tint (ClutterColorizeEffect *effect, if (effect->actor != NULL) clutter_actor_queue_redraw (effect->actor); - _clutter_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_TINT]); + g_object_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_TINT]); } /** diff --git a/clutter/clutter-deform-effect.c b/clutter/clutter-deform-effect.c index b976d612d..2454f233e 100644 --- a/clutter/clutter-deform-effect.c +++ b/clutter/clutter-deform-effect.c @@ -566,9 +566,9 @@ clutter_deform_effect_class_init (ClutterDeformEffectClass *klass) gobject_class->finalize = clutter_deform_effect_finalize; gobject_class->set_property = clutter_deform_effect_set_property; gobject_class->get_property = clutter_deform_effect_get_property; - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); meta_class->set_actor = clutter_deform_effect_set_actor; @@ -673,7 +673,7 @@ clutter_deform_effect_set_n_tiles (ClutterDeformEffect *effect, { priv->x_tiles = x_tiles; - _clutter_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_X_TILES]); + g_object_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_X_TILES]); tiles_changed = TRUE; } @@ -682,7 +682,7 @@ clutter_deform_effect_set_n_tiles (ClutterDeformEffect *effect, { priv->y_tiles = y_tiles; - _clutter_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_Y_TILES]); + g_object_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_Y_TILES]); tiles_changed = TRUE; } diff --git a/clutter/clutter-desaturate-effect.c b/clutter/clutter-desaturate-effect.c index 98592cc31..8f00630fe 100644 --- a/clutter/clutter-desaturate-effect.c +++ b/clutter/clutter-desaturate-effect.c @@ -311,9 +311,9 @@ clutter_desaturate_effect_class_init (ClutterDesaturateEffectClass *klass) gobject_class->set_property = clutter_desaturate_effect_set_property; gobject_class->get_property = clutter_desaturate_effect_get_property; - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); } static void @@ -367,7 +367,7 @@ clutter_desaturate_effect_set_factor (ClutterDesaturateEffect *effect, if (effect->actor != NULL) clutter_actor_queue_redraw (effect->actor); - _clutter_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_FACTOR]); + g_object_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_FACTOR]); } } diff --git a/clutter/clutter-device-manager.c b/clutter/clutter-device-manager.c index 363b4bcb1..489aa9b4d 100644 --- a/clutter/clutter-device-manager.c +++ b/clutter/clutter-device-manager.c @@ -135,9 +135,9 @@ clutter_device_manager_class_init (ClutterDeviceManagerClass *klass) gobject_class->set_property = clutter_device_manager_set_property; gobject_class->get_property = clutter_device_manager_get_property; - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); /** * ClutterDeviceManager::device-added: diff --git a/clutter/clutter-drag-action.c b/clutter/clutter-drag-action.c index 190f9f5f8..c2259d2da 100644 --- a/clutter/clutter-drag-action.c +++ b/clutter/clutter-drag-action.c @@ -557,9 +557,9 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass) gobject_class->set_property = clutter_drag_action_set_property; gobject_class->get_property = clutter_drag_action_get_property; gobject_class->dispose = clutter_drag_action_dispose; - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - drag_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + drag_props); /** * ClutterDragAction::drag-begin: @@ -714,14 +714,14 @@ clutter_drag_action_set_drag_threshold (ClutterDragAction *action, { priv->x_drag_threshold = x_threshold; - _clutter_notify_by_pspec (self, drag_props[PROP_X_DRAG_THRESHOLD]); + g_object_notify_by_pspec (self, drag_props[PROP_X_DRAG_THRESHOLD]); } if (priv->y_drag_threshold != y_threshold) { priv->y_drag_threshold = y_threshold; - _clutter_notify_by_pspec (self, drag_props[PROP_Y_DRAG_THRESHOLD]); + g_object_notify_by_pspec (self, drag_props[PROP_Y_DRAG_THRESHOLD]); } g_object_thaw_notify (self); @@ -778,7 +778,7 @@ clutter_drag_action_set_drag_handle (ClutterDragAction *action, priv->drag_handle = handle; - _clutter_notify_by_pspec (G_OBJECT (action), drag_props[PROP_DRAG_HANDLE]); + g_object_notify_by_pspec (G_OBJECT (action), drag_props[PROP_DRAG_HANDLE]); } /** @@ -826,7 +826,7 @@ clutter_drag_action_set_drag_axis (ClutterDragAction *action, priv->drag_axis = axis; - _clutter_notify_by_pspec (G_OBJECT (action), drag_props[PROP_DRAG_AXIS]); + g_object_notify_by_pspec (G_OBJECT (action), drag_props[PROP_DRAG_AXIS]); } /** diff --git a/clutter/clutter-flow-layout.c b/clutter/clutter-flow-layout.c index 6cfb769ae..0a890e995 100644 --- a/clutter/clutter-flow-layout.c +++ b/clutter/clutter-flow-layout.c @@ -999,9 +999,9 @@ clutter_flow_layout_class_init (ClutterFlowLayoutClass *klass) gobject_class->finalize = clutter_flow_layout_finalize; gobject_class->set_property = clutter_flow_layout_set_property; gobject_class->get_property = clutter_flow_layout_get_property; - _clutter_object_class_install_properties (gobject_class, - N_PROPERTIES, - flow_properties); + g_object_class_install_properties (gobject_class, + N_PROPERTIES, + flow_properties); } static void @@ -1087,7 +1087,7 @@ clutter_flow_layout_set_orientation (ClutterFlowLayout *layout, manager = CLUTTER_LAYOUT_MANAGER (layout); clutter_layout_manager_layout_changed (manager); - _clutter_notify_by_pspec (G_OBJECT (layout), + g_object_notify_by_pspec (G_OBJECT (layout), flow_properties[PROP_ORIENTATION]); } } @@ -1140,7 +1140,7 @@ clutter_flow_layout_set_homogeneous (ClutterFlowLayout *layout, manager = CLUTTER_LAYOUT_MANAGER (layout); clutter_layout_manager_layout_changed (manager); - _clutter_notify_by_pspec (G_OBJECT (layout), + g_object_notify_by_pspec (G_OBJECT (layout), flow_properties[PROP_HOMOGENEOUS]); } } @@ -1191,7 +1191,7 @@ clutter_flow_layout_set_column_spacing (ClutterFlowLayout *layout, manager = CLUTTER_LAYOUT_MANAGER (layout); clutter_layout_manager_layout_changed (manager); - _clutter_notify_by_pspec (G_OBJECT (layout), + g_object_notify_by_pspec (G_OBJECT (layout), flow_properties[PROP_COLUMN_SPACING]); } } @@ -1243,7 +1243,7 @@ clutter_flow_layout_set_row_spacing (ClutterFlowLayout *layout, manager = CLUTTER_LAYOUT_MANAGER (layout); clutter_layout_manager_layout_changed (manager); - _clutter_notify_by_pspec (G_OBJECT (layout), + g_object_notify_by_pspec (G_OBJECT (layout), flow_properties[PROP_ROW_SPACING]); } } @@ -1313,11 +1313,11 @@ clutter_flow_layout_set_column_width (ClutterFlowLayout *layout, } if (notify_min) - _clutter_notify_by_pspec (G_OBJECT (layout), + g_object_notify_by_pspec (G_OBJECT (layout), flow_properties[PROP_MIN_COLUMN_WIDTH]); if (notify_max) - _clutter_notify_by_pspec (G_OBJECT (layout), + g_object_notify_by_pspec (G_OBJECT (layout), flow_properties[PROP_MAX_COLUMN_WIDTH]); g_object_thaw_notify (G_OBJECT (layout)); @@ -1393,11 +1393,11 @@ clutter_flow_layout_set_row_height (ClutterFlowLayout *layout, } if (notify_min) - _clutter_notify_by_pspec (G_OBJECT (layout), + g_object_notify_by_pspec (G_OBJECT (layout), flow_properties[PROP_MIN_ROW_HEGHT]); if (notify_max) - _clutter_notify_by_pspec (G_OBJECT (layout), + g_object_notify_by_pspec (G_OBJECT (layout), flow_properties[PROP_MAX_ROW_HEIGHT]); g_object_thaw_notify (G_OBJECT (layout)); diff --git a/clutter/clutter-page-turn-effect.c b/clutter/clutter-page-turn-effect.c index 5fe074837..ec42f89c8 100644 --- a/clutter/clutter-page-turn-effect.c +++ b/clutter/clutter-page-turn-effect.c @@ -321,7 +321,7 @@ clutter_page_turn_effect_set_period (ClutterPageTurnEffect *effect, clutter_deform_effect_invalidate (CLUTTER_DEFORM_EFFECT (effect)); - _clutter_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_PERIOD]); + g_object_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_PERIOD]); } /** @@ -362,7 +362,7 @@ clutter_page_turn_effect_set_angle (ClutterPageTurnEffect *effect, clutter_deform_effect_invalidate (CLUTTER_DEFORM_EFFECT (effect)); - _clutter_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_ANGLE]); + g_object_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_ANGLE]); } /** @@ -402,7 +402,7 @@ clutter_page_turn_effect_set_radius (ClutterPageTurnEffect *effect, clutter_deform_effect_invalidate (CLUTTER_DEFORM_EFFECT (effect)); - _clutter_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_RADIUS]); + g_object_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_RADIUS]); } /** diff --git a/clutter/clutter-path-constraint.c b/clutter/clutter-path-constraint.c index 3016e0149..165476616 100644 --- a/clutter/clutter-path-constraint.c +++ b/clutter/clutter-path-constraint.c @@ -232,9 +232,9 @@ clutter_path_constraint_class_init (ClutterPathConstraintClass *klass) gobject_class->set_property = clutter_path_constraint_set_property; gobject_class->get_property = clutter_path_constraint_get_property; gobject_class->dispose = clutter_path_constraint_dispose; - _clutter_object_class_install_properties (gobject_class, - LAST_PROPERTY, - path_properties); + g_object_class_install_properties (gobject_class, + LAST_PROPERTY, + path_properties); meta_class->set_actor = clutter_path_constraint_set_actor; @@ -328,7 +328,7 @@ clutter_path_constraint_set_path (ClutterPathConstraint *constraint, if (constraint->actor != NULL) clutter_actor_queue_relayout (constraint->actor); - _clutter_notify_by_pspec (G_OBJECT (constraint), path_properties[PROP_PATH]); + g_object_notify_by_pspec (G_OBJECT (constraint), path_properties[PROP_PATH]); } /** @@ -374,7 +374,7 @@ clutter_path_constraint_set_offset (ClutterPathConstraint *constraint, if (constraint->actor != NULL) clutter_actor_queue_relayout (constraint->actor); - _clutter_notify_by_pspec (G_OBJECT (constraint), path_properties[PROP_OFFSET]); + g_object_notify_by_pspec (G_OBJECT (constraint), path_properties[PROP_OFFSET]); } /** diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h index ed64ae446..3fdd3ef15 100644 --- a/clutter/clutter-private.h +++ b/clutter/clutter-private.h @@ -46,12 +46,6 @@ G_BEGIN_DECLS typedef struct _ClutterMainContext ClutterMainContext; -#define _clutter_notify_by_pspec(obj, pspec) \ - g_object_notify_by_pspec ((obj), (pspec)) - -#define _clutter_object_class_install_properties(oclass, n_pspecs, pspecs) \ - g_object_class_install_properties ((oclass), (n_pspecs), (pspecs)) - #define CLUTTER_REGISTER_VALUE_TRANSFORM_TO(TYPE_TO,func) { \ g_value_register_transform_func (g_define_type_id, TYPE_TO, func); \ } diff --git a/clutter/clutter-script.c b/clutter/clutter-script.c index 5ba91d60a..bda40c635 100644 --- a/clutter/clutter-script.c +++ b/clutter/clutter-script.c @@ -409,9 +409,9 @@ clutter_script_class_init (ClutterScriptClass *klass) gobject_class->get_property = clutter_script_get_property; gobject_class->finalize = clutter_script_finalize; - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); } static void diff --git a/clutter/clutter-shader-effect.c b/clutter/clutter-shader-effect.c index 3a64b0268..f7b8ed06c 100644 --- a/clutter/clutter-shader-effect.c +++ b/clutter/clutter-shader-effect.c @@ -420,9 +420,9 @@ clutter_shader_effect_class_init (ClutterShaderEffectClass *klass) gobject_class->set_property = clutter_shader_effect_set_property; gobject_class->finalize = clutter_shader_effect_finalize; - _clutter_object_class_install_properties (gobject_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (gobject_class, + PROP_LAST, + obj_props); meta_class->set_actor = clutter_shader_effect_set_actor; diff --git a/clutter/clutter-shader.c b/clutter/clutter-shader.c index e2109c70a..59be19d62 100644 --- a/clutter/clutter-shader.c +++ b/clutter/clutter-shader.c @@ -367,7 +367,7 @@ clutter_shader_set_source (ClutterShader *shader, priv->fragment_source = g_strndup (data, length); priv->fragment_is_glsl = is_glsl; - _clutter_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_FRAGMENT_SOURCE]); + g_object_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_FRAGMENT_SOURCE]); break; case CLUTTER_VERTEX_SHADER: @@ -375,7 +375,7 @@ clutter_shader_set_source (ClutterShader *shader, priv->vertex_source = g_strndup (data, length); priv->vertex_is_glsl = is_glsl; - _clutter_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_VERTEX_SOURCE]); + g_object_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_VERTEX_SOURCE]); break; } @@ -602,7 +602,7 @@ clutter_shader_compile (ClutterShader *shader, } priv->compiled = bind_glsl_shader (shader, error); - _clutter_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_COMPILED]); + g_object_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_COMPILED]); return priv->compiled; } @@ -622,7 +622,7 @@ clutter_shader_release (ClutterShader *shader) clutter_shader_release_internal (shader); - _clutter_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_COMPILED]); + g_object_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_COMPILED]); } /** @@ -690,7 +690,7 @@ clutter_shader_set_is_enabled (ClutterShader *shader, else cogl_program_use (COGL_INVALID_HANDLE); - _clutter_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_ENABLED]); + g_object_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_ENABLED]); } } diff --git a/clutter/clutter-snap-constraint.c b/clutter/clutter-snap-constraint.c index e80b4cac8..507721514 100644 --- a/clutter/clutter-snap-constraint.c +++ b/clutter/clutter-snap-constraint.c @@ -464,7 +464,7 @@ clutter_snap_constraint_set_source (ClutterSnapConstraint *constraint, clutter_actor_queue_relayout (constraint->actor); } - _clutter_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_SOURCE]); + g_object_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_SOURCE]); } /** @@ -513,7 +513,7 @@ clutter_snap_constraint_set_edges (ClutterSnapConstraint *constraint, if (constraint->from_edge != from_edge) { constraint->from_edge = from_edge; - _clutter_notify_by_pspec (G_OBJECT (constraint), + g_object_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_FROM_EDGE]); from_changed = TRUE; } @@ -521,7 +521,7 @@ clutter_snap_constraint_set_edges (ClutterSnapConstraint *constraint, if (constraint->to_edge != to_edge) { constraint->to_edge = to_edge; - _clutter_notify_by_pspec (G_OBJECT (constraint), + g_object_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_TO_EDGE]); to_changed = TRUE; } @@ -582,7 +582,7 @@ clutter_snap_constraint_set_offset (ClutterSnapConstraint *constraint, if (constraint->actor != NULL) clutter_actor_queue_relayout (constraint->actor); - _clutter_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_OFFSET]); + g_object_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_OFFSET]); } /** diff --git a/clutter/clutter-state.c b/clutter/clutter-state.c index ffacaffc8..58c76b80f 100644 --- a/clutter/clutter-state.c +++ b/clutter/clutter-state.c @@ -524,7 +524,7 @@ clutter_state_change (ClutterState *state, priv->source_state_name = priv->target_state_name; priv->target_state_name = target_state_name; - _clutter_notify_by_pspec (G_OBJECT (state), obj_props[PROP_STATE]); + g_object_notify_by_pspec (G_OBJECT (state), obj_props[PROP_STATE]); duration = clutter_state_get_duration (state, priv->source_state_name, diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c index 496e4641f..f65e2f559 100644 --- a/clutter/clutter-text.c +++ b/clutter/clutter-text.c @@ -270,7 +270,7 @@ clutter_text_clear_selection (ClutterText *self) if (priv->selection_bound != priv->position) { priv->selection_bound = priv->position; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_BOUND]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_BOUND]); clutter_actor_queue_redraw (CLUTTER_ACTOR (self)); } } @@ -490,7 +490,7 @@ clutter_text_set_font_description_internal (ClutterText *self, if (priv->text && priv->text[0] != '\0') clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FONT_DESCRIPTION]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FONT_DESCRIPTION]); } static void @@ -948,10 +948,10 @@ clutter_text_delete_selection (ClutterText *self) /* Not required to be guarded by g_object_freeze/thaw_notify */ if (priv->position != old_position) - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_POSITION]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_POSITION]); if (priv->selection_bound != old_selection) - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_BOUND]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_BOUND]); return TRUE; } @@ -1022,7 +1022,7 @@ clutter_text_set_text_internal (ClutterText *self, clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); g_signal_emit (self, text_signals[TEXT_CHANGED], 0); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_TEXT]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_TEXT]); g_object_thaw_notify (G_OBJECT (self)); } @@ -3328,7 +3328,7 @@ clutter_text_set_editable (ClutterText *self, clutter_actor_queue_redraw (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_EDITABLE]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_EDITABLE]); } } @@ -3378,7 +3378,7 @@ clutter_text_set_selectable (ClutterText *self, clutter_actor_queue_redraw (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTABLE]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTABLE]); } } @@ -3432,7 +3432,7 @@ clutter_text_set_activatable (ClutterText *self, clutter_actor_queue_redraw (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ACTIVATABLE]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ACTIVATABLE]); } } @@ -3523,7 +3523,7 @@ clutter_text_set_cursor_visible (ClutterText *self, clutter_actor_queue_redraw (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_VISIBLE]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_VISIBLE]); } } @@ -3577,8 +3577,8 @@ clutter_text_set_cursor_color (ClutterText *self, clutter_actor_queue_redraw (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_COLOR]); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_COLOR_SET]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_COLOR]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_COLOR_SET]); } /** @@ -3719,7 +3719,7 @@ clutter_text_set_selection_bound (ClutterText *self, clutter_actor_queue_redraw (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_BOUND]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_BOUND]); } } @@ -3775,8 +3775,8 @@ clutter_text_set_selection_color (ClutterText *self, clutter_actor_queue_redraw (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_COLOR]); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_COLOR_SET]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_COLOR]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SELECTION_COLOR_SET]); } /** @@ -3934,7 +3934,7 @@ clutter_text_set_font_name (ClutterText *self, clutter_text_set_font_description_internal (self, desc); priv->is_default_font = is_default_font; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FONT_NAME]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FONT_NAME]); out: if (is_default_font) @@ -3996,7 +3996,7 @@ clutter_text_set_use_markup_internal (ClutterText *self, priv->markup_attrs = NULL; } - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_USE_MARKUP]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_USE_MARKUP]); } } @@ -4120,7 +4120,7 @@ clutter_text_set_color (ClutterText *self, clutter_actor_queue_redraw (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_COLOR]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_COLOR]); } /** @@ -4177,7 +4177,7 @@ clutter_text_set_ellipsize (ClutterText *self, clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ELLIPSIZE]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ELLIPSIZE]); } } @@ -4247,7 +4247,7 @@ clutter_text_set_line_wrap (ClutterText *self, clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LINE_WRAP]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LINE_WRAP]); } } @@ -4280,7 +4280,7 @@ clutter_text_set_line_wrap_mode (ClutterText *self, clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LINE_WRAP_MODE]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LINE_WRAP_MODE]); } } @@ -4345,7 +4345,7 @@ clutter_text_set_attributes (ClutterText *self, clutter_text_dirty_cache (self); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ATTRIBUTES]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ATTRIBUTES]); clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); } @@ -4402,7 +4402,7 @@ clutter_text_set_line_alignment (ClutterText *self, clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LINE_ALIGNMENT]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LINE_ALIGNMENT]); } } @@ -4515,7 +4515,7 @@ clutter_text_set_justify (ClutterText *self, clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_JUSTIFY]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_JUSTIFY]); } } @@ -4594,7 +4594,7 @@ clutter_text_set_cursor_position (ClutterText *self, clutter_actor_queue_redraw (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_POSITION]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_POSITION]); } /** @@ -4628,7 +4628,7 @@ clutter_text_set_cursor_size (ClutterText *self, clutter_actor_queue_redraw (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_SIZE]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_SIZE]); } } @@ -4680,7 +4680,7 @@ clutter_text_set_password_char (ClutterText *self, clutter_text_dirty_cache (self); clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_PASSWORD_CHAR]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_PASSWORD_CHAR]); } } @@ -4738,7 +4738,7 @@ clutter_text_set_max_length (ClutterText *self, clutter_text_set_text (self, new); g_free (new); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MAX_LENGTH]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MAX_LENGTH]); } } @@ -4963,7 +4963,7 @@ clutter_text_delete_chars (ClutterText *self, g_string_free (new, TRUE); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_TEXT]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_TEXT]); } /** @@ -5050,13 +5050,13 @@ clutter_text_set_single_line_mode (ClutterText *self, { priv->activatable = TRUE; - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ACTIVATABLE]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_ACTIVATABLE]); } clutter_text_dirty_cache (self); clutter_actor_queue_relayout (CLUTTER_ACTOR (self)); - _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SINGLE_LINE_MODE]); + g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SINGLE_LINE_MODE]); g_object_thaw_notify (G_OBJECT (self)); } diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c index 4080c438d..38af6f70d 100644 --- a/clutter/clutter-texture.c +++ b/clutter/clutter-texture.c @@ -1507,7 +1507,7 @@ clutter_texture_set_cogl_texture (ClutterTexture *texture, /* If resized actor may need resizing but paint() will do this */ clutter_actor_queue_redraw (CLUTTER_ACTOR (texture)); - _clutter_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_COGL_TEXTURE]); + g_object_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_COGL_TEXTURE]); } static gboolean @@ -2056,7 +2056,7 @@ clutter_texture_set_from_file (ClutterTexture *texture, g_signal_emit (texture, texture_signals[LOAD_FINISHED], 0, NULL); - _clutter_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_FILENAME]); + g_object_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_FILENAME]); return TRUE; } @@ -2104,7 +2104,7 @@ clutter_texture_set_filter_quality (ClutterTexture *texture, clutter_actor_queue_redraw (CLUTTER_ACTOR (texture)); - _clutter_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_FILTER_QUALITY]); + g_object_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_FILTER_QUALITY]); } } @@ -2715,7 +2715,7 @@ clutter_texture_set_sync_size (ClutterTexture *texture, clutter_actor_queue_relayout (CLUTTER_ACTOR (texture)); - _clutter_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_SYNC_SIZE]); + g_object_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_SYNC_SIZE]); } } @@ -2767,7 +2767,7 @@ clutter_texture_set_repeat (ClutterTexture *texture, { priv->repeat_x = repeat_x; - _clutter_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_REPEAT_X]); + g_object_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_REPEAT_X]); changed = TRUE; } @@ -2776,7 +2776,7 @@ clutter_texture_set_repeat (ClutterTexture *texture, { priv->repeat_y = repeat_y; - _clutter_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_REPEAT_Y]); + g_object_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_REPEAT_Y]); changed = TRUE; } @@ -2870,7 +2870,7 @@ clutter_texture_set_keep_aspect_ratio (ClutterTexture *texture, clutter_actor_queue_relayout (CLUTTER_ACTOR (texture)); - _clutter_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_KEEP_ASPECT_RATIO]); + g_object_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_KEEP_ASPECT_RATIO]); } } @@ -2925,8 +2925,8 @@ clutter_texture_set_load_async (ClutterTexture *texture, priv->load_async_set = load_async; - _clutter_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_LOAD_ASYNC]); - _clutter_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_LOAD_DATA_ASYNC]); + g_object_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_LOAD_ASYNC]); + g_object_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_LOAD_DATA_ASYNC]); } } @@ -2983,8 +2983,8 @@ clutter_texture_set_load_data_async (ClutterTexture *texture, priv->load_async_set = load_async; - _clutter_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_LOAD_ASYNC]); - _clutter_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_LOAD_DATA_ASYNC]); + g_object_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_LOAD_ASYNC]); + g_object_notify_by_pspec (G_OBJECT (texture), obj_props[PROP_LOAD_DATA_ASYNC]); } } diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c index a2db02fb5..db0f8692a 100644 --- a/clutter/clutter-timeline.c +++ b/clutter/clutter-timeline.c @@ -332,9 +332,9 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) object_class->finalize = clutter_timeline_finalize; object_class->set_property = clutter_timeline_set_property; object_class->get_property = clutter_timeline_get_property; - _clutter_object_class_install_properties (object_class, - PROP_LAST, - obj_props); + g_object_class_install_properties (object_class, + PROP_LAST, + obj_props); /** * ClutterTimeline::new-frame: @@ -691,7 +691,7 @@ clutter_timeline_do_frame (ClutterTimeline *timeline) else priv->direction = CLUTTER_TIMELINE_FORWARD; - _clutter_notify_by_pspec (G_OBJECT (timeline), + g_object_notify_by_pspec (G_OBJECT (timeline), obj_props[PROP_DIRECTION]); } @@ -851,7 +851,7 @@ clutter_timeline_set_loop (ClutterTimeline *timeline, { timeline->priv->loop = loop; - _clutter_notify_by_pspec (G_OBJECT (timeline), obj_props[PROP_LOOP]); + g_object_notify_by_pspec (G_OBJECT (timeline), obj_props[PROP_LOOP]); } } @@ -1077,7 +1077,7 @@ clutter_timeline_set_delay (ClutterTimeline *timeline, if (priv->delay != msecs) { priv->delay = msecs; - _clutter_notify_by_pspec (G_OBJECT (timeline), obj_props[PROP_DELAY]); + g_object_notify_by_pspec (G_OBJECT (timeline), obj_props[PROP_DELAY]); } } @@ -1129,7 +1129,7 @@ clutter_timeline_set_duration (ClutterTimeline *timeline, { priv->duration = msecs; - _clutter_notify_by_pspec (G_OBJECT (timeline), obj_props[PROP_DURATION]); + g_object_notify_by_pspec (G_OBJECT (timeline), obj_props[PROP_DURATION]); } } @@ -1202,7 +1202,7 @@ clutter_timeline_set_direction (ClutterTimeline *timeline, if (priv->elapsed_time == 0) priv->elapsed_time = priv->duration; - _clutter_notify_by_pspec (G_OBJECT (timeline), obj_props[PROP_DIRECTION]); + g_object_notify_by_pspec (G_OBJECT (timeline), obj_props[PROP_DIRECTION]); } } @@ -1605,7 +1605,7 @@ clutter_timeline_set_auto_reverse (ClutterTimeline *timeline, { priv->auto_reverse = reverse; - _clutter_notify_by_pspec (G_OBJECT (timeline), + g_object_notify_by_pspec (G_OBJECT (timeline), obj_props[PROP_AUTO_REVERSE]); } }