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

Fix some animation_set_* functions so they cope if the value is the same

Browse Source 
The following functions are fixed:

clutter_animation_set_actor
clutter_animation_set_timeline
clutter_animation_set_alpha

This is related to bug 1392 which discusses the problem for
behaviour_set_alpha.
This commit is contained in:
Neil Roberts 2009-01-05 13:14:12 +00:00
parent 39f4848b93
commit ff73fe3e1f
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
clutter/clutter-animation.c
View File

@ -739,6 +739,8 @@ clutter_animation_set_actor (ClutterAnimation *animation,
priv = animation->priv; priv = animation->priv;
g_object_ref (actor);
if (priv->actor) if (priv->actor)
{ {
g_object_weak_unref (G_OBJECT (animation), g_object_weak_unref (G_OBJECT (animation),
@ -750,7 +752,7 @@ clutter_animation_set_actor (ClutterAnimation *animation,
g_object_unref (priv->actor); g_object_unref (priv->actor);
} }
priv->actor = g_object_ref (actor); priv->actor = actor;
g_object_weak_ref (G_OBJECT (animation), g_object_weak_ref (G_OBJECT (animation),
on_animation_weak_notify, on_animation_weak_notify,
priv->actor); priv->actor);
@ -967,6 +969,9 @@ clutter_animation_set_timeline (ClutterAnimation *animation,
priv = animation->priv; priv = animation->priv;
if (timeline && priv->timeline == timeline)
return;
g_object_freeze_notify (G_OBJECT (animation)); g_object_freeze_notify (G_OBJECT (animation));
if (priv->timeline) if (priv->timeline)
@ -1047,16 +1052,6 @@ clutter_animation_set_alpha (ClutterAnimation *animation,
priv = animation->priv; priv = animation->priv;
if (priv->alpha)
{
if (priv->alpha_notify_id)
g_signal_handler_disconnect (priv->alpha, priv->alpha_notify_id);
g_object_unref (priv->alpha);
priv->alpha_notify_id = 0;
priv->alpha = NULL;
}
if (!alpha) if (!alpha)
{ {
ClutterTimeline *timeline; ClutterTimeline *timeline;
@ -1068,7 +1063,19 @@ clutter_animation_set_alpha (ClutterAnimation *animation,
clutter_animation_set_mode_internal (animation, alpha); clutter_animation_set_mode_internal (animation, alpha);
} }
priv->alpha = g_object_ref_sink (alpha); g_object_ref_sink (alpha);
if (priv->alpha)
{
if (priv->alpha_notify_id)
g_signal_handler_disconnect (priv->alpha, priv->alpha_notify_id);
g_object_unref (priv->alpha);
priv->alpha_notify_id = 0;
priv->alpha = NULL;
}
priv->alpha = alpha;
priv->alpha_notify_id = priv->alpha_notify_id =
g_signal_connect (alpha, "notify::alpha", g_signal_connect (alpha, "notify::alpha",