frame

Merge lp://staging/~chasedouglas/frame/upstream-xi into lp://staging/frame

upstream-xi
Merge into trunk

Proposed by Chase Douglas on 2012-01-17

Status:	Merged
Merged at revision:	55
Proposed branch:	lp://staging/~chasedouglas/frame/upstream-xi
Merge into:	lp://staging/frame
Diff against target:	1265 lines (+173/-719) 18 files modified src/Makefile.am (+0/-2) src/libutouch-frame.ver (+0/-4) src/v1/frame-xi2.c (+0/-324) src/v2/window.h (+1/-1) src/v2/x11/device_x11.cpp (+10/-13) src/v2/x11/device_x11.h (+2/-2) src/v2/x11/handle_x11.cpp (+8/-3) src/v2/x11/window_x11.cpp (+51/-22) src/v2/x11/window_x11.h (+4/-2) test/recordings/ntrig-dell-xt2.event (+1/-0) test/recordings/ntrig-dell-xt2.prop (+2/-1) test/x11/device.cpp (+1/-1) test/x11/fixture.cpp (+0/-1) test/x11/recording.cpp (+93/-135) tools/Makefile.am (+0/-8) tools/utouch-frame-test-x11.c (+0/-1) tools/utouch-frame-test-xi2.c (+0/-177) tools/utouch-frame-test-xi2.txt (+0/-22)
To merge this branch:	bzr merge lp://staging/~chasedouglas/frame/upstream-xi
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Stephen M. Webb (community)		2012-01-17	Approve on 2012-01-17
Review via email: mp+88927@code.staging.launchpad.net

Description of the change

Update to upstream XI API. The current utouch-frame trunk branch includes an unreleased minor version bump to 2.1.0, which would cover this transition as well.

Revision history for this message

Stephen M. Webb (bregma) wrote on 2012-01-17:

As far as I can see this all looks correct (I'm not sure what the mtdev bugs were, but I'll assume these test changes are appropriate).

I don't see the SONAME bump required by the removal of the V1 symbols.

review: Needs Fixing

Revision history for this message

Chase Douglas (chasedouglas) wrote on 2012-01-17:

> I don't see the SONAME bump required by the removal of the V1 symbols.

This merge doesn't remove the V1 symbols. It only removes the original xi2 symbols which were never used by anyone (to a 99.99% certainty :). Do you think we should bother bumping the SONAME for this?

Revision history for this message

Stephen M. Webb (bregma) wrote on 2012-01-17:

OK, I can't find any use of teh _xi2 symbols in the utouch code, it's probably OK to just let it pass. I'll switch this to approved.

review: Approve