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-rotate.c b/src/gestures-rotate.c
index 03e8f3c..0fff8a4 100644
--- a/src/gestures-rotate.c
+++ b/src/gestures-rotate.c
@@ -63,10 +63,8 @@ int gru_rotate(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;
@@ -101,10 +99,8 @@ int gru_winrotate(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;