libX11: Changes to 'master'

[Julien Cristau]

 modules/im/ximcp/imThaiFlt.c |   11 +++++++++--
 src/KeyBind.c                |    2 +-
 src/xkb/XKBGAlloc.c          |    4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 690f8bffd48a4e7e74298360ddd0431dc95dcd3f
Author: Erkki Seppälä <erkki.seppala at vincit.fi>
Date:   Tue Jan 18 15:58:20 2011 +0200

    xkb: XkbPropertyPtr determined allocation success from wrong variables
    
    Cannot reach dead statement "return NULL;"
    
    Check for the NULLness of prop->name and prop->value instead of
    name and value, which was checked earlier anyway. Decided against
    using strdup due to curious memory allocation functions and the
    rest of the xkb not using it either.
    
    Signed-off-by: Erkki Seppälä <erkki.seppala at vincit.fi>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 6a4d027284e7bb5dd458157947bbb1ff580ad071
Author: Erkki Seppälä <erkki.seppala at vincit.fi>
Date:   Mon Jan 10 16:37:22 2011 +0200

    keyBind: Use Xcalloc to initialize allocated _XKeytrans
    
    Using uninitialized value "p->modifiers"
    
    Small fix by using Xcalloc instead of Xmalloc
    
    Signed-off-by: Erkki Seppälä <erkki.seppala at vincit.fi>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit b993d73bb3214ecc24646f5427c8003b816c6921
Author: Erkki Seppälä <erkki.seppala at vincit.fi>
Date:   Mon Jan 10 16:22:45 2011 +0200

    im/ximcp: release modifiermap before returning
    
    Variable "map" goes out of scope
    
    Release modifiermap before returning. Reordered code to call
    XGetModifierMapping after the first return from the function.
    
    Signed-off-by: Erkki Seppälä <erkki.seppala at vincit.fi>
    Reviewed-by: Dirk Wallenstein <halsmit at t-online.de>