Merge lp:~chasedouglas/geis/fix-geisv1-class-ids into lp:geis

[Chase Douglas]

The Geisv1 gesture IDs were changed when the old grail architecture was removed, since the IDs were based on grail v2 constants. Unfortunately, the gesture IDs are part of the v1 ABI. The change causes all geisv1 clients to fail to work.

This merge proposal resets the gesture ID values to match what is in the public header.

[lp:~chasedouglas/geis/fix-geisv1-class-ids]

286. By Chase Douglas on 2012-09-07

Revert the gesture class IDs to their original values

This broke Geisv1 clients, where the values are part of the ABI.

[Chase Douglas (chasedouglas)]

Due to the timing of things, I'm just going to unilaterally push this through. I believe this is the correct solution to the issue.

review: Approve

[Stephen M. Webb (bregma)]

Maps grail gesture types to public geis gesture types. Existing clients should remain unaffected.

review: Approve

=== modified file 'libgeis/backend/grail/geis_grail_backend.c'
--- libgeis/backend/grail/geis_grail_backend.c	2012-09-05 18:37:28 +0000
+++ libgeis/backend/grail/geis_grail_backend.c	2012-09-07 20:21:18 +0000
@@ -1325,23 +1325,23 @@
                       / sizeof(struct GeisFilterableAttribute);
 
   gbe->drag_class = geis_gesture_class_new(GEIS_GESTURE_DRAG,
-                                           UGGestureTypeDrag);
+                                           GEIS_GESTURE_PRIMITIVE_DRAG);
   geis_register_gesture_class(gbe->geis, gbe->drag_class, attr_count, attrs);
 
   gbe->pinch_class = geis_gesture_class_new(GEIS_GESTURE_PINCH,
-                                            UGGestureTypePinch);
+                                            GEIS_GESTURE_PRIMITIVE_PINCH);
   geis_register_gesture_class(gbe->geis, gbe->pinch_class, attr_count, attrs);
 
   gbe->rotate_class = geis_gesture_class_new(GEIS_GESTURE_ROTATE,
-                                             UGGestureTypeRotate);
+                                             GEIS_GESTURE_PRIMITIVE_ROTATE);
   geis_register_gesture_class(gbe->geis, gbe->rotate_class, attr_count, attrs);
 
   gbe->tap_class = geis_gesture_class_new(GEIS_GESTURE_TAP,
-                                          UGGestureTypeTap);
+                                          GEIS_GESTURE_PRIMITIVE_TAP);
   geis_register_gesture_class(gbe->geis, gbe->tap_class, attr_count, attrs);
 
   gbe->touch_class = geis_gesture_class_new(GEIS_GESTURE_TOUCH,
-                                            UGGestureTypeTouch);
+                                            GEIS_GESTURE_PRIMITIVE_TOUCH);
   geis_register_gesture_class(gbe->geis, gbe->touch_class, attr_count, attrs);
 }