lp://qastaging/~bregma/grail/lp-1475888

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/grail at revision 258

PS Jenkins bot (community): Approve (continuous-integration) on 2016-01-25

Brandon Schaefer (community): Approve on 2016-01-25

Diff: 146 lines (+16/-27)

5 files modified

m4/xorg-gtest.m4 (+7/-6)
src/subscription.cpp (+4/-16)
src/subscription.h (+2/-2)
test/gtest/Makefile.am (+2/-2)
test/integration/x11/timeout.cpp (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1475888: In subscription.h Limit timeout is defined float, I believe it should be uint64_t

Medium

Fix Released

Link a bug report

Related blueprints

260. By Stephen M. Webb on 2016-01-25

removed explicit checks for unsigned < 0

259. By Stephen M. Webb on 2016-01-25

reduced check for replayed touch timeout because evidently there was a semantic change in upstream x.org

258. By Stephen M. Webb on 2016-01-25

refresh xorg-gtest build rules due to upstream changes

257. By Stephen M. Webb on 2016-01-25

timeout: stored uint64_t instead of converting back and forth to float

256. By PS Jenkins bot on 2013-06-07

Releasing 3.1.0daily13.06.05-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

255. By PS Jenkins bot on 2013-05-17

Releasing 3.1.0daily13.05.17ubuntu.unity.next-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

254. By PS Jenkins bot on 2013-02-26

Releasing 3.1.0daily13.02.26-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

253. By Stephen M. Webb on 2013-02-11

Bump the version to 3.1.0.

Approved by Christopher Townsend.

252. By PS Jenkins bot on 2012-12-07

Releasing 3.0.9daily12.12.07.1-0ubuntu1 to ubuntu.

Approved by .

251. By Daniel d'Andrada on 2012-12-06

Get rid of x11 specific code in grail implementation.

That way grail can be compiled with x11 dependencies and still process correctly frames that were generated via frame_backend.h instead of frame_x11.h.

Also use frame_backend.h instead of a frame mock in tests, which is a more realistic situation and also exercises the frame_backend.h API. It wouldn't be possible to do that if grail implementation still had frame_x11_* calls.

Approved by Stephen M. Webb.