[clutter/clutter-1.18] timeline: Fix bad logic in check
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.18] timeline: Fix bad logic in check
- Date: Mon, 10 Feb 2014 17:44:28 +0000 (UTC)
commit d15760292429ade316b77e689d39d34a40a0ada9
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Feb 10 17:39:30 2014 +0000
timeline: Fix bad logic in check
https://bugzilla.gnome.org/show_bug.cgi?id=711540
clutter/clutter-timeline.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c
index adb942a..b830b37 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]