Merge lp:~chasedouglas/oif-qml/remove-gesture-reject into lp:oif-qml

[Chase Douglas]

Remove bad calls to geis_gesture_reject(). The API has changed, and the previous calls were merely noops. I pushed for trying to get the API in before we knew how it needed to look. Mea culpa.

[Stephen M. Webb (bregma)]

OK. This will get the FTBFS without changing any functionality.

review: Approve

=== modified file 'src/geissingleton.cpp'
--- src/geissingleton.cpp	2011-10-14 17:22:30 +0000
+++ src/geissingleton.cpp	2012-04-23 22:18:19 +0000
@@ -319,7 +319,7 @@
     }
 
     if (ContainsClaimedTouches(touches, claimed_touches)) {
-      geis_gesture_reject(geis_frame_id(frame));
+      /* FIXME: Need to reject gesture here */
       continue;
     }
 
@@ -344,7 +344,7 @@
 
     QGraphicsScene* scene = FindSceneForTouches(window, touches_rect);
     if (!scene && items.empty()) {
-      geis_gesture_reject(geis_frame_id(frame));
+      /* FIXME: Need to reject gesture here */
       continue;
     }
 
@@ -408,7 +408,8 @@
       /* FIXME: Need a way to accept a gesture frame */
       claimed_touches.unite(touches);
     else
-      geis_gesture_reject(geis_frame_id(frame));
+      /* FIXME: Need to reject gesture here */
+      ;
   }
 }