libX11: Changes to 'master'

[Jamey Sharp]

 src/xcb_io.c |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 978c7238789037de917b9423ea9adfb006da1260
Author: Jamey Sharp <jamey at minilop.net>
Date:   Sat Jun 19 10:44:55 2010 -0700

    poll_for_response: Really handle xcb_poll_for_reply getting a reply.
    
    Don't lose async replies. That's bad.
    
    `xlsfonts -l`, which uses XListFontsWithInfo, worked fine, because the
    _XReply path worked; that path waited for replies, rather than polling.
    
    However, XRecordProcessReplies, which does nothing but call XPending,
    relied on the event-handling path to process async replies, and that was
    busted.
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=28595
    
    Signed-off-by: Jamey Sharp <jamey at minilop.net>

commit ef67486c5a8aada24fd95b2991a3c4979f53805f
Author: Jamey Sharp <jamey at minilop.net>
Date:   Mon Jun 21 13:34:15 2010 -0700

    Revert "xcb_io.c: poll_for_response doesn't guarantee there's a pending request."
    
    This reverts commit 4a8b6528ff69f6feb8c0e119939b4ce6c088f29e, because as
    a matter of fact, if poll_for_response returns NULL when we know
    dpy->xcb->next_event is non-NULL, there *is* guaranteed to be a pending
    request.

commit 301ec5b41e9d253a446db656e1789ac7345dc433
Author: Jamey Sharp <jamey at minilop.net>
Date:   Mon Jun 21 13:24:24 2010 -0700

    Revert "poll_for_response: Really handle xcb_poll_for_reply getting a reply."
    
    This reverts commit c115095d7f2bc4f5a4fb26380e3698fefdad7611. We *do*
    need to check poll_for_event every time through the loop in
    poll_for_response, so the commit did too much.