libX11: Changes to 'master'

[Jeremy Huddleston]

 modules/im/ximcp/imRm.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit b5a108624331fabf393223c0891914cc54d4caf4
Author: Yann Droneaud <yann at droneaud.fr>
Date:   Tue Oct 11 17:27:59 2011 +0200

    Return name instead of False in XSetICValues()
    
    In case of error, XSetICValues() must return the first argument
    that failed to be set.
    
    But in some error paths, it returns False, which is converted to NULL,
    so the function returns OK in case of error.
    
    Signed-off-by: Yann Droneaud <yann at droneaud.fr>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

commit 10992cb8dc5e4d938e7e5a633b68a81b5875f3ba
Author: Yann Droneaud <yann at droneaud.fr>
Date:   Sun Oct 9 17:56:45 2011 +0200

    Return name instead of value in XGetIMValues() and XSetIMValues()
    
    As stated in man page (XOpenIM) and Xlib documentation (chapter 13.5.3),
    XGetIMValues() and XSetImValues() "returns the name of the first argument
    that could not be obtained."
    
    But currently,
    
      err = XGetIMValues(im, "invalid", &arg, NULL);
    
    returns &arg instead of "invalid".
    
    This patch fixes https://bugs.freedesktop.org/show_bug.cgi?id=12897
    
    Signed-off-by: Yann Droneaud <yann at droneaud.fr>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>