OIF-qml

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

  1. remove-gesture-reject
  2. Merge into trunk
Proposed by Chase Douglas
Status: Merged
Merged at revision: 113
Proposed branch: lp:~chasedouglas/oif-qml/remove-gesture-reject
Merge into: lp:oif-qml
Diff against target: 30 lines (+4/-3)
1 file modified
src/geissingleton.cpp (+4/-3)
To merge this branch: bzr merge lp:~chasedouglas/oif-qml/remove-gesture-reject
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Review via email: mp+103183@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/geissingleton.cpp'
2--- src/geissingleton.cpp 2011-10-14 17:22:30 +0000
3+++ src/geissingleton.cpp 2012-04-23 22:18:19 +0000
4@@ -319,7 +319,7 @@
5 }
6
7 if (ContainsClaimedTouches(touches, claimed_touches)) {
8- geis_gesture_reject(geis_frame_id(frame));
9+ /* FIXME: Need to reject gesture here */
10 continue;
11 }
12
13@@ -344,7 +344,7 @@
14
15 QGraphicsScene* scene = FindSceneForTouches(window, touches_rect);
16 if (!scene && items.empty()) {
17- geis_gesture_reject(geis_frame_id(frame));
18+ /* FIXME: Need to reject gesture here */
19 continue;
20 }
21
22@@ -408,7 +408,8 @@
23 /* FIXME: Need a way to accept a gesture frame */
24 claimed_touches.unite(touches);
25 else
26- geis_gesture_reject(geis_frame_id(frame));
27+ /* FIXME: Need to reject gesture here */
28+ ;
29 }
30 }
31

Subscribers

People subscribed via source and target branches