2007-09-27 Matthew Allum <mallum@openedhand.com>

Merge from stable.

        * clutter/clutter-behaviour-path.c: (path_alpha_to_position)
        Fix uninitialized variable (#480, Gwenole Beauchesne)
This commit is contained in:
Matthew Allum 2007-09-27 22:15:25 +00:00
parent 5ab0ed5a00
commit cf48841f2b
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2007-09-27 Matthew Allum <mallum@openedhand.com>
Merge from stable.
* clutter/clutter-behaviour-path.c: (path_alpha_to_position)
Fix uninitialized variable (#480, Gwenole Beauchesne)
2007-09-27 Matthew Allum <mallum@openedhand.com>
* 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

View File

@ -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)