Merge lp:~oif-team/grail/trunk.lp-748282 into lp:grail

[Henrik Rydberg]

Seems to work over here. Tested using grail-gesture with two gesture masks: 0xffffffffffffffff and 0x0000000f00000000

[Henrik Rydberg (rydberg)]

Forgot to merge a fix from last week, so tree got convoluted - resubmitting this branch on top of the fresh trunk.

[Chase Douglas (chasedouglas)]

This looks correct and improves the handling of touch gestures. There's still a question about whether the glue timeouts are long enough, but this can be addressed in a second merge request if needed.

review: Approve

=== modified file 'src/gestures-touch.c'
--- src/gestures-touch.c	2011-03-28 20:04:07 +0000
+++ src/gestures-touch.c	2011-04-04 17:28:34 +0000
@@ -53,6 +53,8 @@
 		state->gid = gin_gid_begin(ge, type, -PRIO_GESTURE, frame);
 		state->active = 1;
 	}
+	if (move->time - move->fm[FM_X].original_ms <= move->fm[FM_X].hold_ms)
+		return 0;
 	state->nprop = gin_add_contact_props(ge->gin, state->prop, frame);
 	gru_event(ge, state->gid, move, state->prop, state->nprop);
 	return 1;
@@ -88,6 +90,8 @@
 			return 0;
 		}
 	}
+	if (move->time - move->fm[FM_X].original_ms <= move->fm[FM_X].hold_ms)
+		return 0;
 	state->nprop = gin_add_contact_props(ge->gin, state->prop, frame);
 	gru_event(ge, state->gid, move, state->prop, state->nprop);
 	return 1;