frame

Merge lp:~oif-team/frame/active-fix into lp:frame

  1. active-fix
  2. Merge into trunk
Proposed by Chase Douglas
Status: Merged
Merged at revision: 35
Proposed branch: lp:~oif-team/frame/active-fix
Merge into: lp:frame
Diff against target: 12 lines (+1/-1)
1 file modified
src/frame-xi2.c (+1/-1)
To merge this branch: bzr merge lp:~oif-team/frame/active-fix
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Review via email: mp+61442@code.launchpad.net

Description of the change

A silly typo crept in when we were adding support for semi-mt trackpads. This one character change fixes things.

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

I see what you did there.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/frame-xi2.c'
2--- src/frame-xi2.c 2011-04-13 20:01:01 +0000
3+++ src/frame-xi2.c 2011-05-18 17:02:11 +0000
4@@ -309,7 +309,7 @@
5 for (i = 0; i < nbit; i++)
6 if (XIMaskIsSet(mask, i))
7 handle_event(fh, slot, i, value[num++]);
8- if (ev->evtype != XI_TouchBegin)
9+ if (ev->evtype == XI_TouchBegin)
10 utouch_frame_get_current_slot(fh)->active = 1;
11 else if (ev->evtype == XI_TouchEnd)
12 utouch_frame_get_current_slot(fh)->active = 0;

Subscribers

People subscribed via source and target branches