Decouple timeout from discard

Move the actual gesture discard from the recognition phase
to the instantiation phase.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

1 files changed, 2 insertions, 6 deletions

diff --git a/src/gestures-pinch.c b/src/gestures-pinch.c
index 18772a0..bc5db1f 100644
--- a/src/gestures-pinch.c
+++ b/src/gestures-pinch.c
@@ -64,10 +64,8 @@ int gru_pinch(struct grail *ge,
         }
         if ((move->timeout & fm_mask) == fm_mask) {
                 if (state->active) {
-                        gin_gid_discard(ge, state->gid);
-                        state->active = 0;
+                        gin_gid_timeout(ge, state->gid);
                 }
-                return 0;
         }
         if (!(move->tickle & mask))
                 return 0;
@@ -102,10 +100,8 @@ int gru_winpinch(struct grail *ge,
         }
         if ((move->timeout & fm_mask) == fm_mask) {
                 if (state->active) {
-                        gin_gid_discard(ge, state->gid);
-                        state->active = 0;
+                        gin_gid_timeout(ge, state->gid);
                 }
-                return 0;
         }
         if (!(move->tickle & mask))
                 return 0;