isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 12:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

actor: Make consistent use of the name in error reporting

Browse Source 
Whenever we are warning inside ClutterActor we prefer the actor's name
to its type, if the name is set. The current code is made less readable
by the use of the ternary operator:

  priv->name != NULL ? priv->name : G_OBJECT_TYPE_NAME (self)

This looks like a job for a simple convenience function.
This commit is contained in:
Emmanuele Bassi 2010-04-27 10:12:25 +01:00
parent 9024cd9f7c
commit b7098563c2
1 changed files with 46 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
clutter/clutter-actor.c
View File

@ -573,6 +573,12 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (ClutterActor,
G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE, G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
clutter_scriptable_iface_init)); clutter_scriptable_iface_init));
static const gchar *
get_actor_debug_name (ClutterActor *actor)
{
return actor->priv->name != NULL ? actor->priv->name
: G_OBJECT_TYPE_NAME (actor);
}
#ifdef CLUTTER_ENABLE_DEBUG #ifdef CLUTTER_ENABLE_DEBUG
/* XXX - this is for debugging only, remove once working (or leave /* XXX - this is for debugging only, remove once working (or leave
@ -599,17 +605,13 @@ clutter_actor_verify_map_state (ClutterActor *self)
else else
g_warning ("Realized non-toplevel actor '%s' should " g_warning ("Realized non-toplevel actor '%s' should "
"have a parent", "have a parent",
priv->name ? priv->name get_actor_debug_name (self));
: G_OBJECT_TYPE_NAME (self));
} }
else if (!CLUTTER_ACTOR_IS_REALIZED (priv->parent_actor)) else if (!CLUTTER_ACTOR_IS_REALIZED (priv->parent_actor))
{ {
g_warning ("Realized actor %s has an unrealized parent %s", g_warning ("Realized actor %s has an unrealized parent %s",
priv->name ? priv->name get_actor_debug_name (self),
: G_OBJECT_TYPE_NAME (self), get_actor_debug_name (priv->parent_actor));
clutter_actor_get_name (priv->parent_actor)
? clutter_actor_get_name (priv->parent_actor)
: G_OBJECT_TYPE_NAME (priv->parent_actor));
} }
} }
} }
@ -618,8 +620,7 @@ clutter_actor_verify_map_state (ClutterActor *self)
{ {
if (!CLUTTER_ACTOR_IS_REALIZED (self)) if (!CLUTTER_ACTOR_IS_REALIZED (self))
g_warning ("Actor '%s' is mapped but not realized", g_warning ("Actor '%s' is mapped but not realized",
priv->name ? priv->name get_actor_debug_name (self));
: G_OBJECT_TYPE_NAME (self));
/* remaining bets are off during reparent when we're potentially /* remaining bets are off during reparent when we're potentially
* mapped, but should not be according to invariants * mapped, but should not be according to invariants
@ -635,15 +636,13 @@ clutter_actor_verify_map_state (ClutterActor *self)
{ {
g_warning ("Toplevel actor '%s' is mapped " g_warning ("Toplevel actor '%s' is mapped "
"but not visible", "but not visible",
priv->name ? priv->name get_actor_debug_name (self));
: G_OBJECT_TYPE_NAME (self));
} }
} }
else else
{ {
g_warning ("Mapped actor '%s' should have a parent", g_warning ("Mapped actor '%s' should have a parent",
priv->name ? priv->name get_actor_debug_name (self));
:G_OBJECT_TYPE_NAME (self));
} }
} }
else else
@ -665,18 +664,18 @@ clutter_actor_verify_map_state (ClutterActor *self)
if (!CLUTTER_ACTOR_IS_VISIBLE (priv->parent_actor)) if (!CLUTTER_ACTOR_IS_VISIBLE (priv->parent_actor))
{ {
g_warning ("Actor '%s' should not be mapped if parent " g_warning ("Actor '%s' should not be mapped if parent '%s'"
"is not visible", "is not visible",
priv->name ? priv->name get_actor_debug_name (self),
: G_OBJECT_TYPE_NAME (self)); get_actor_debug_name (priv->parent_actor));
} }
if (!CLUTTER_ACTOR_IS_REALIZED (priv->parent_actor)) if (!CLUTTER_ACTOR_IS_REALIZED (priv->parent_actor))
{ {
g_warning ("Actor '%s' should not be mapped if parent " g_warning ("Actor '%s' should not be mapped if parent '%s'"
"is not realized", "is not realized",
priv->name ? priv->name get_actor_debug_name (self),
: G_OBJECT_TYPE_NAME (self)); get_actor_debug_name (priv->parent_actor));
} }
if (!(CLUTTER_PRIVATE_FLAGS (priv->parent_actor) & if (!(CLUTTER_PRIVATE_FLAGS (priv->parent_actor) &
@ -684,9 +683,9 @@ clutter_actor_verify_map_state (ClutterActor *self)
{ {
if (!CLUTTER_ACTOR_IS_MAPPED (priv->parent_actor)) if (!CLUTTER_ACTOR_IS_MAPPED (priv->parent_actor))
g_warning ("Actor '%s' is mapped but its non-toplevel " g_warning ("Actor '%s' is mapped but its non-toplevel "
"parent is not mapped", "parent '%s' is not mapped",
priv->name ? priv->name get_actor_debug_name (self),
: G_OBJECT_TYPE_NAME (self)); get_actor_debug_name (priv->parent_actor));
} }
} }
} }
@ -856,8 +855,7 @@ clutter_actor_update_map_state (ClutterActor *self,
{ {
if (priv->parent_actor == NULL) if (priv->parent_actor == NULL)
g_warning ("Attempting to map an unparented actor '%s'", g_warning ("Attempting to map an unparented actor '%s'",
priv->name ? priv->name get_actor_debug_name (self));
: G_OBJECT_TYPE_NAME (self));
should_be_mapped = TRUE; should_be_mapped = TRUE;
must_be_realized = TRUE; must_be_realized = TRUE;
@ -873,14 +871,13 @@ clutter_actor_update_map_state (ClutterActor *self,
g_warning ("Attempting to map a child that does not " g_warning ("Attempting to map a child that does not "
"meet the necessary invariants: the actor '%s' " "meet the necessary invariants: the actor '%s' "
"has no parent", "has no parent",
priv->name ? priv->name get_actor_debug_name (self));
: G_OBJECT_TYPE_NAME (self));
else else
g_warning ("Attempting to map a child that does not " g_warning ("Attempting to map a child that does not "
"meet the necessary invariants: the actor '%s' " "meet the necessary invariants: the actor '%s' "
"is parented to an unmapped actor", "is parented to an unmapped actor '%s'",
priv->name ? priv->name get_actor_debug_name (self),
: G_OBJECT_TYPE_NAME (self)); get_actor_debug_name (priv->parent_actor));
} }
/* If in reparent, we temporarily suspend unmap and unrealize. /* If in reparent, we temporarily suspend unmap and unrealize.
@ -913,8 +910,7 @@ clutter_actor_update_map_state (ClutterActor *self,
if (!must_be_realized) if (!must_be_realized)
g_warning ("Somehow we think actor '%s' should be mapped but " g_warning ("Somehow we think actor '%s' should be mapped but "
"not realized, which isn't allowed", "not realized, which isn't allowed",
priv->name ? priv->name get_actor_debug_name (self));
: G_OBJECT_TYPE_NAME (self));
/* realization is allowed to fail (though I don't know what /* realization is allowed to fail (though I don't know what
* an app is supposed to do about that - shouldn't it just * an app is supposed to do about that - shouldn't it just
@ -1294,10 +1290,7 @@ clutter_actor_realize (ClutterActor *self)
return; return;
} }
CLUTTER_NOTE (ACTOR, "Realizing actor '%s' [%p]", CLUTTER_NOTE (ACTOR, "Realizing actor '%s'", get_actor_debug_name (self));
priv->name ? priv->name
: G_OBJECT_TYPE_NAME (self),
self);
CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_REALIZED); CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_REALIZED);
g_object_notify (G_OBJECT (self), "realized"); g_object_notify (G_OBJECT (self), "realized");
@ -1706,9 +1699,10 @@ clutter_actor_real_queue_redraw (ClutterActor *self,
{ {
ClutterActor *parent; ClutterActor *parent;
CLUTTER_NOTE (PAINT, "Redraw queued on '%s'", CLUTTER_NOTE (PAINT, "Redraw queued on '%s' (from: '%s')",
clutter_actor_get_name (self) ? clutter_actor_get_name (self) get_actor_debug_name (self),
: G_OBJECT_TYPE_NAME (self)); origin != NULL ? get_actor_debug_name (origin)
: "same actor");
/* no point in queuing a redraw on a destroyed actor */ /* no point in queuing a redraw on a destroyed actor */
if (CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IN_DESTRUCTION) if (CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IN_DESTRUCTION)
@ -3219,14 +3213,15 @@ clutter_actor_dispose (GObject *object)
static void static void
clutter_actor_finalize (GObject *object) clutter_actor_finalize (GObject *object)
{ {
ClutterActor *actor = CLUTTER_ACTOR (object); ClutterActorPrivate *priv = CLUTTER_ACTOR (object)->priv;
CLUTTER_NOTE (MISC, "Finalize object (id=%d) of type '%s'", CLUTTER_NOTE (MISC, "Finalize actor (name='%s', id=%d) of type '%s'",
actor->priv->id, priv->name != NULL ? priv->name : "<none>",
g_type_name (G_OBJECT_TYPE (actor))); priv->id,
g_type_name (G_OBJECT_TYPE (object)));
g_free (actor->priv->name); g_free (priv->name);
clutter_id_pool_remove (CLUTTER_CONTEXT()->id_pool, actor->priv->id); clutter_id_pool_remove (CLUTTER_CONTEXT()->id_pool, priv->id);
G_OBJECT_CLASS (clutter_actor_parent_class)->finalize (object); G_OBJECT_CLASS (clutter_actor_parent_class)->finalize (object);
} }
@ -4825,8 +4820,7 @@ clutter_actor_queue_relayout (ClutterActor *self)
g_warning ("The actor '%s' is currently inside an allocation " g_warning ("The actor '%s' is currently inside an allocation "
"cycle; calling clutter_actor_queue_relayout() is " "cycle; calling clutter_actor_queue_relayout() is "
"not recommended", "not recommended",
priv->name ? priv->name get_actor_debug_name (self));
: G_OBJECT_TYPE_NAME (self));
} }
g_signal_emit (self, actor_signals[QUEUE_RELAYOUT], 0); g_signal_emit (self, actor_signals[QUEUE_RELAYOUT], 0);
@ -7323,8 +7317,7 @@ clutter_actor_raise (ClutterActor *self,
{ {
g_warning ("%s: Actor '%s' is not inside a container", g_warning ("%s: Actor '%s' is not inside a container",
G_STRFUNC, G_STRFUNC,
self->priv->name != NULL ? self->priv->name get_actor_debug_name (self));
: G_OBJECT_TYPE_NAME (self));
return; return;
} }
@ -7335,10 +7328,8 @@ clutter_actor_raise (ClutterActor *self,
g_warning ("%s Actor '%s' is not in the same container as " g_warning ("%s Actor '%s' is not in the same container as "
"actor '%s'", "actor '%s'",
G_STRFUNC, G_STRFUNC,
self->priv->name != NULL ? self->priv->name get_actor_debug_name (self),
: G_OBJECT_TYPE_NAME (self), get_actor_debug_name (below));
below->priv->name != NULL ? below->priv->name
: G_OBJECT_TYPE_NAME (below));
return; return;
} }
} }
@ -7371,8 +7362,7 @@ clutter_actor_lower (ClutterActor *self,
{ {
g_warning ("%s: Actor of type %s is not inside a container", g_warning ("%s: Actor of type %s is not inside a container",
G_STRFUNC, G_STRFUNC,
self->priv->name != NULL ? self->priv->name get_actor_debug_name (self));
: G_OBJECT_TYPE_NAME (self));
return; return;
} }
@ -7383,10 +7373,8 @@ clutter_actor_lower (ClutterActor *self,
g_warning ("%s: Actor '%s' is not in the same container as " g_warning ("%s: Actor '%s' is not in the same container as "
"actor '%s'", "actor '%s'",
G_STRFUNC, G_STRFUNC,
self->priv->name != NULL ? self->priv->name get_actor_debug_name (self),
: G_OBJECT_TYPE_NAME (self), get_actor_debug_name (above));
above->priv->name != NULL ? above->priv->name
: G_OBJECT_TYPE_NAME (above));
return; return;
} }
} }