isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 17:10:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter/actor: Always generate the same debug name

Browse Source 
It's useful also for non-debug builds to have a more proper name for
actors, e.g. when tracing.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1700>
This commit is contained in:
Jonas Ådahl 2021-02-04 08:48:49 +01:00
parent 796eb005bc
commit 6a0dd2a0fa
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/clutter/clutter-actor.c
View File

@ -777,10 +777,8 @@ struct _ClutterActorPrivate
ClutterColor bg_color; ClutterColor bg_color;
#ifdef CLUTTER_ENABLE_DEBUG
/* a string used for debugging messages */ /* a string used for debugging messages */
gchar *debug_name; gchar *debug_name;
#endif
/* a set of clones of the actor */ /* a set of clones of the actor */
GHashTable *clones; GHashTable *clones;
@ -1116,7 +1114,6 @@ _clutter_actor_get_debug_name (ClutterActor *actor)
ClutterActorPrivate *priv = actor->priv; ClutterActorPrivate *priv = actor->priv;
const gchar *retval; const gchar *retval;
#ifdef CLUTTER_ENABLE_DEBUG
if (G_UNLIKELY (priv->debug_name == NULL)) if (G_UNLIKELY (priv->debug_name == NULL))
{ {
priv->debug_name = g_strdup_printf ("<%s>[<%s>:%p]", priv->debug_name = g_strdup_printf ("<%s>[<%s>:%p]",
@ -1127,11 +1124,6 @@ _clutter_actor_get_debug_name (ClutterActor *actor)
} }
retval = priv->debug_name; retval = priv->debug_name;
#else
retval = priv->name != NULL
? priv->name
: G_OBJECT_TYPE_NAME (actor);
#endif
return retval; return retval;
} }
@ -5582,9 +5574,7 @@ clutter_actor_finalize (GObject *object)
g_free (priv->name); g_free (priv->name);
#ifdef CLUTTER_ENABLE_DEBUG
g_free (priv->debug_name); g_free (priv->debug_name);
#endif
G_OBJECT_CLASS (clutter_actor_parent_class)->finalize (object); G_OBJECT_CLASS (clutter_actor_parent_class)->finalize (object);
} }