isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

timeline: Fix bad logic in check

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=711540
This commit is contained in:
Emmanuele Bassi 2014-02-10 17:39:30 +00:00
parent dd034cccad
commit d157602924
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clutter/clutter-timeline.c
View File

@ -2447,9 +2447,9 @@ clutter_timeline_get_step_progress (ClutterTimeline *timeline,
{
g_return_val_if_fail (CLUTTER_IS_TIMELINE (timeline), FALSE);
if (timeline->priv->progress_mode != CLUTTER_STEPS ||
timeline->priv->progress_mode != CLUTTER_STEP_START ||
timeline->priv->progress_mode != CLUTTER_STEP_END)
if (!(timeline->priv->progress_mode == CLUTTER_STEPS ||
timeline->priv->progress_mode == CLUTTER_STEP_START ||
timeline->priv->progress_mode == CLUTTER_STEP_END))
return FALSE;
if (n_steps != NULL)
@ -2521,11 +2521,11 @@ clutter_timeline_get_cubic_bezier_progress (ClutterTimeline *timeline,
{
g_return_val_if_fail (CLUTTER_IS_TIMELINE (timeline), FALSE);
if (timeline->priv->progress_mode != CLUTTER_CUBIC_BEZIER ||
timeline->priv->progress_mode != CLUTTER_EASE ||
timeline->priv->progress_mode != CLUTTER_EASE_IN ||
timeline->priv->progress_mode != CLUTTER_EASE_OUT ||
timeline->priv->progress_mode != CLUTTER_EASE_IN_OUT)
if (!(timeline->priv->progress_mode == CLUTTER_CUBIC_BEZIER ||
timeline->priv->progress_mode == CLUTTER_EASE ||
timeline->priv->progress_mode == CLUTTER_EASE_IN ||
timeline->priv->progress_mode == CLUTTER_EASE_OUT ||
timeline->priv->progress_mode == CLUTTER_EASE_IN_OUT))
return FALSE;
if (c_1 != NULL)