diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2019-10-07 16:47:25 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2019-10-07 16:47:25 +0000 |
| commit | e1efdc92f71e1c233dfb680cc73549392079a3b6 (patch) | |
| tree | e4480a4625f8adc5ec0a53cb78aeefe59ad95f47 | |
| parent | 25be50900b3c9745c4da45db347bd985b9f96c6f (diff) | |
| parent | c70913e2df8c8e3b924ca355e73cc12bfb45fcb7 (diff) | |
| download | clutter-e1efdc92f71e1c233dfb680cc73549392079a3b6.tar.gz | |
Merge branch 'wip/remove-scattered-refs' into 'master'
transition: Don't split reference counting with actor
See merge request GNOME/clutter!12
| -rw-r--r-- | clutter/clutter-actor.c | 7 | ||||
| -rw-r--r-- | clutter/clutter-transition.c | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index 6e7fefe75..fd2990116 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -19046,13 +19046,6 @@ on_transition_stopped (ClutterTransition *transition, if (clutter_transition_get_remove_on_complete (transition)) { - /* we take a reference here because removing the closure will release the - * reference on the transition, and we want the transition to survive the - * signal emission. It'll be unreferenced by the remove-on-complete - * handling in ClutterTransition::stopped. - */ - g_object_ref (transition); - /* this is safe, because the timeline has now stopped, * so we won't recurse; the reference on the Animatable * will be dropped by the ::stopped signal closure in diff --git a/clutter/clutter-transition.c b/clutter/clutter-transition.c index 03f91d0af..bf4c7af2c 100644 --- a/clutter/clutter-transition.c +++ b/clutter/clutter-transition.c @@ -136,7 +136,6 @@ clutter_transition_stopped (ClutterTimeline *timeline, clutter_transition_detach (CLUTTER_TRANSITION (timeline), priv->animatable); g_clear_object (&priv->animatable); - g_object_unref (timeline); } } |