From cf48841f2bcb6067dca000afea590f60f8f54962 Mon Sep 17 00:00:00 2001 From: Matthew Allum Date: Thu, 27 Sep 2007 22:15:25 +0000 Subject: [PATCH] 2007-09-27 Matthew Allum Merge from stable. * clutter/clutter-behaviour-path.c: (path_alpha_to_position) Fix uninitialized variable (#480, Gwenole Beauchesne) --- ChangeLog | 9 ++++++++- clutter/clutter-behaviour-path.c | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 196b99745..4ebe75f4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-09-27 Matthew Allum + + Merge from stable. + + * clutter/clutter-behaviour-path.c: (path_alpha_to_position) + Fix uninitialized variable (#480, Gwenole Beauchesne) + 2007-09-27 Matthew Allum * clutter/clutter-event.c: @@ -5,7 +12,7 @@ * clutter/clutter-main.c: Further event tweaks; - Ref the event actor source - - Protect against off stage events (button releases) + - Protect against off stage events (button releases) (#511) - Move more into ClutterEventAny - Add a click count to button event (as yet unused) - Minor cleanups diff --git a/clutter/clutter-behaviour-path.c b/clutter/clutter-behaviour-path.c index 835c0abff..aa47d4219 100644 --- a/clutter/clutter-behaviour-path.c +++ b/clutter/clutter-behaviour-path.c @@ -158,7 +158,7 @@ path_alpha_to_position (ClutterBehaviourPath *behave, ClutterBehaviourPathPrivate *priv = behave->priv; ClutterBehaviour *behaviour = CLUTTER_BEHAVIOUR (behave); GSList *l; - gint total_len, offset, dist_to_next, dist = 0; + gint total_len, offset, dist = 0; /* FIXME: Optimise. Much of the data used here can be pre-generated * ( total_len, dist between knots ) when knots are added/removed. @@ -209,6 +209,7 @@ path_alpha_to_position (ClutterBehaviourPath *behave, for (l = priv->knots; l != NULL; l = l->next) { + gint dist_to_next = 0; ClutterKnot *knot = l->data; if (l->next)