diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2014-06-25 16:58:18 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2014-06-26 01:31:41 +0100 |
| commit | 79767b64a9cfc1166c29155ce87d711a9a79f71d (patch) | |
| tree | 174ef62580aab8a2c9fa9f18427dbd6575bc0a3d | |
| parent | 830618eac150e6068ce44de664f9697f6764acab (diff) | |
| download | clutter-79767b64a9cfc1166c29155ce87d711a9a79f71d.tar.gz | |
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>
| -rw-r--r-- | 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 cca84d057..f4e841896 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) |