[mutter] clutter/actor: Deduplicate child destruction loop
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] clutter/actor: Deduplicate child destruction loop
- Date: Tue, 19 Jul 2022 10:49:05 +0000 (UTC)
commit 4a70a73e42ca9e87242b853b9a43e7219b914bf3
Author: Daniel van Vugt <daniel van vugt canonical com>
Date: Wed Nov 3 16:24:06 2021 +0800
clutter/actor: Deduplicate child destruction loop
It's identical in clutter_actor_real_destroy and
clutter_actor_destroy_all_children, other than the latter having
some extra error checking.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2074>
clutter/clutter/clutter-actor.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
---
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index 722b5cbdac..00f51b04fd 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -5904,15 +5904,7 @@ clutter_actor_real_calculate_resource_scale (ClutterActor *self,
static void
clutter_actor_real_destroy (ClutterActor *actor)
{
- ClutterActorIter iter;
-
- g_object_freeze_notify (G_OBJECT (actor));
-
- clutter_actor_iter_init (&iter, actor);
- while (clutter_actor_iter_next (&iter, NULL))
- clutter_actor_iter_destroy (&iter);
-
- g_object_thaw_notify (G_OBJECT (actor));
+ clutter_actor_destroy_all_children (actor);
}
static GObject *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]