brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

actor: Improve readability of raise/lower warnings

Browse Source 
• Add the function name in the warning, since the text is the same in
  both clutter_actor_raise() and clutter_actor_lower().

• If an actor has a name then prefer it to the type name.
This commit is contained in:
Emmanuele Bassi 2010-02-09 10:34:41 +00:00
parent 7664568fff
commit bbb058df40
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
clutter/clutter-actor.c
View File

@ -7032,7 +7032,8 @@ clutter_actor_reparent (ClutterActor *self,
* *
* Puts @self above @below. * Puts @self above @below.
* *
* Both actors must have the same parent. * Both actors must have the same parent, and the parent must implement
* the #ClutterContainer interface
* *
* This function is the equivalent of clutter_container_raise_child(). * This function is the equivalent of clutter_container_raise_child().
*/ */
@ -7045,21 +7046,26 @@ clutter_actor_raise (ClutterActor *self,
g_return_if_fail (CLUTTER_IS_ACTOR (self)); g_return_if_fail (CLUTTER_IS_ACTOR (self));
parent = clutter_actor_get_parent (self); parent = clutter_actor_get_parent (self);
if (!parent) if (parent == NULL || !CLUTTER_IS_CONTAINER (parent))
{ {
g_warning ("Actor of type %s is not inside a container", g_warning ("%s: Actor '%s' is not inside a container",
g_type_name (G_OBJECT_TYPE (self))); G_STRFUNC,
self->priv->name != NULL ? self->priv->name
: G_OBJECT_TYPE_NAME (self));
return; return;
} }
if (below) if (below != NULL)
{ {
if (parent != clutter_actor_get_parent (below)) if (parent != clutter_actor_get_parent (below))
{ {
g_warning ("Actor of type %s is not in the same " g_warning ("%s Actor '%s' is not in the same container as "
"container of actor of type %s", "actor '%s'",
g_type_name (G_OBJECT_TYPE (self)), G_STRFUNC,
g_type_name (G_OBJECT_TYPE (below))); self->priv->name != NULL ? self->priv->name
: G_OBJECT_TYPE_NAME (self),
below->priv->name != NULL ? below->priv->name
: G_OBJECT_TYPE_NAME (below));
return; return;
} }
} }
@ -7074,7 +7080,8 @@ clutter_actor_raise (ClutterActor *self,
* *
* Puts @self below @above. * Puts @self below @above.
* *
* Both actors must have the same parent. * Both actors must have the same parent, and the parent must implement
* the #ClutterContainer interface.
* *
* This function is the equivalent of clutter_container_lower_child(). * This function is the equivalent of clutter_container_lower_child().
*/ */
@ -7087,10 +7094,12 @@ clutter_actor_lower (ClutterActor *self,
g_return_if_fail (CLUTTER_IS_ACTOR(self)); g_return_if_fail (CLUTTER_IS_ACTOR(self));
parent = clutter_actor_get_parent (self); parent = clutter_actor_get_parent (self);
if (!parent) if (parent == NULL || !CLUTTER_IS_CONTAINER (parent))
{ {
g_warning ("Actor of type %s is not inside a container", g_warning ("%s: Actor of type %s is not inside a container",
g_type_name (G_OBJECT_TYPE (self))); G_STRFUNC,
self->priv->name != NULL ? self->priv->name
: G_OBJECT_TYPE_NAME (self));
return; return;
} }
@ -7098,10 +7107,13 @@ clutter_actor_lower (ClutterActor *self,
{ {
if (parent != clutter_actor_get_parent (above)) if (parent != clutter_actor_get_parent (above))
{ {
g_warning ("Actor of type %s is not in the same " g_warning ("%s: Actor '%s' is not in the same container as "
"container of actor of type %s", "actor '%s'",
g_type_name (G_OBJECT_TYPE (self)), G_STRFUNC,
g_type_name (G_OBJECT_TYPE (above))); self->priv->name != NULL ? self->priv->name
: G_OBJECT_TYPE_NAME (self),
above->priv->name != NULL ? above->priv->name
: G_OBJECT_TYPE_NAME (above));
return; return;
} }
} }