Merge lp://qastaging/~bratsche/oif/evince-libgrip into lp://qastaging/~oif-team/oif/evince-gestures-trunk

Proposed by Cody Russell
Status: Merged
Merged at revision: 4209
Proposed branch: lp://qastaging/~bratsche/oif/evince-libgrip
Merge into: lp://qastaging/~oif-team/oif/evince-gestures-trunk
Diff against target: 279 lines (+115/-126)
2 files modified
configure.ac (+1/-1)
shell/ev-window.c (+114/-125)
To merge this branch: bzr merge lp://qastaging/~bratsche/oif/evince-libgrip
Reviewer Review Type Date Requested Status
Mohamed IKBEL Boulabiar (community) Approve
Duncan McGreggor (community) Needs Information
Review via email: mp+41621@code.qastaging.launchpad.net
To post a comment you must log in.
4208. By Cody Russell

Merge from trunk, resolve conflicts.

Revision history for this message
Duncan McGreggor (oubiwann) wrote :

Hey Cody,

I tried building this but autogen fails since there's no package for libgrip... how do I work around that? (Or do you want to push a libgrip package into the PPA?).

review: Needs Information
Revision history for this message
Cody Russell (bratsche) wrote :

Need to package libgrip still. :/

4209. By Cody Russell

Fix warnings, resolve conflict.

Revision history for this message
Cody Russell (bratsche) wrote :

libgrip is packaged now and is in the PPA. I found a couple issues and fixed them in revno 4209.

Revision history for this message
Mohamed IKBEL Boulabiar (boulabiar) wrote :

I liked the factorization of ev_(pinch||drag||rotate)_gesture_(start||update||end) functions into one: ev_gesture_callback

Fully tested and works fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches