libX11: Changes to 'master'

[Jamey Sharp]

 src/xcb_io.c |   55 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 21 deletions(-)

New commits:
commit 405132dab64bf2375f8e57d02b1b53da2311933a
Author: Jamey Sharp <jamey at minilop.net>
Date:   Tue Apr 13 12:12:36 2010 -0700

    Extensions get to filter async errors too.
    
    Apparently I misread XlibInt.c:_XReply and thought that handlers set
    with XESetError should be consulted only for the sequence number that
    _XReply is currently looking for. In fact, the error handlers are also
    consulted when an error arrives for a request that was not expected to
    have a reply.
    
    However, in an odd twist, the error handlers are *not* consulted outside
    of _XReply--that is, when looking for events, or waiting to be able to
    flush the output queue. So this patch takes some small pains to preserve
    that behavior, though it seems likely to have been unintentional.
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=26545
    
    Signed-off-by: Jamey Sharp <jamey at minilop.net>

commit d3eab4a38f3e53ef21eb3b6fa66ead7afecf6227
Author: Jamey Sharp <jamey at minilop.net>
Date:   Tue Apr 13 12:49:59 2010 -0700

    Prefer the xcb_generic_error_t we already have over casting to xEvent.
    
    Just a minor cleanup.
    
    Signed-off-by: Jamey Sharp <jamey at minilop.net>