[clutter/clutter-1.18] gesture-action: Use event type getter
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.18] gesture-action: Use event type getter
- Date: Thu, 26 Jun 2014 00:33:23 +0000 (UTC)
commit 79767b64a9cfc1166c29155ce87d711a9a79f71d
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed Jun 25 16:58:18 2014 +0100
gesture-action: Use event type getter
Don't use direct struct access.
(cherry picked from commit 036c2b3764824a8980b1ae052df4becdb26d4bbb)
Signed-off-by: Emmanuele Bassi <ebassi gnome org>
clutter/clutter-gesture-action.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/clutter/clutter-gesture-action.c b/clutter/clutter-gesture-action.c
index cca84d0..f4e8418 100644
--- a/clutter/clutter-gesture-action.c
+++ b/clutter/clutter-gesture-action.c
@@ -352,8 +352,8 @@ begin_gesture (ClutterGestureAction *action,
}
static gboolean
-stage_captured_event_cb (ClutterActor *stage,
- ClutterEvent *event,
+stage_captured_event_cb (ClutterActor *stage,
+ ClutterEvent *event,
ClutterGestureAction *action)
{
ClutterGestureActionPrivate *priv = action->priv;
@@ -362,10 +362,14 @@ stage_captured_event_cb (ClutterActor *stage,
float threshold_x, threshold_y;
gboolean return_value;
GesturePoint *point;
-
- if (event->type != CLUTTER_TOUCH_CANCEL &&
- event->type != CLUTTER_TOUCH_UPDATE && event->type != CLUTTER_TOUCH_END &&
- event->type != CLUTTER_MOTION && event->type != CLUTTER_BUTTON_RELEASE)
+ ClutterEventType event_type;
+
+ event_type = clutter_event_type (event);
+ if (event_type != CLUTTER_TOUCH_CANCEL &&
+ event_type != CLUTTER_TOUCH_UPDATE &&
+ event_type != CLUTTER_TOUCH_END &&
+ event_type != CLUTTER_MOTION &&
+ event_type != CLUTTER_BUTTON_RELEASE)
return CLUTTER_EVENT_PROPAGATE;
if ((point = gesture_find_point (action, event, &position)) == NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]