Geis

Merge lp://staging/~oif-team/geis/lp_656503 into lp://staging/geis

  1. lp_656503
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Superseded
Proposed branch: lp://staging/~oif-team/geis/lp_656503
Merge into: lp://staging/geis
Diff against target: 53 lines (+11/-5)
3 files modified
ChangeLog (+8/-0)
libutouch-geis-xcb/Makefile.am (+1/-1)
libutouch-geis-xcb/geis_xcb.c (+2/-4)
To merge this branch: bzr merge lp://staging/~oif-team/geis/lp_656503
Reviewer Review Type Date Requested Status
Duncan McGreggor (community) Needs Fixing
Henrik Rydberg (community) Needs Fixing
Review via email: mp+37893@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2010-10-08.

Commit message

Fixes LP: #656503 - event dispatch can hang under some circumstances

Description of the change

Fixes a logic error that can cause an infinite loop under exceptional circumstances.

To post a comment you must log in.
Revision history for this message
Henrik Rydberg (rydberg) wrote :

I think the commit unnecessarily mixes cosmetic printout changes with the important bug fix.

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

Stephen, sorry to be such a pain about this, but I do agree with Henrik. I encourage folks to create more branches. It seems like unecessary overhead, but it makes the code history easier to read and allows for very easy rollbacks in the event of any regressions. For instance, if a week later we had to revert the bug fix, we could (without even thinking about it) keep the formatting changes you made since they would have been in a separate merge.

Thanks!

review: Needs Fixing
lp://staging/~oif-team/geis/lp_656503 updated
81. By Stephen M. Webb

Fixes LP: #656503 - event dispatch can hang under some circumstances

Unmerged revisions

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

to all changes: