summaryrefslogtreecommitdiff
path: root/clutter/clutter-timeline.c
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2014-02-10 17:39:30 +0000
committerEmmanuele Bassi <ebassi@gnome.org>2014-02-10 17:43:16 +0000
commitd15760292429ade316b77e689d39d34a40a0ada9 (patch)
tree52b8cae218cffdcdcee3827ae9802578abdf789f /clutter/clutter-timeline.c
parentdd034cccada9aff4c16cfb98ee14a6017034ee7d (diff)
downloadclutter-d15760292429ade316b77e689d39d34a40a0ada9.tar.gz
timeline: Fix bad logic in check
https://bugzilla.gnome.org/show_bug.cgi?id=711540
Diffstat (limited to 'clutter/clutter-timeline.c')
-rw-r--r--clutter/clutter-timeline.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c
index adb942a5a..b830b3755 100644
--- a/clutter/clutter-timeline.c
+++ b/clutter/clutter-timeline.c
@@ -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)