Attachment 12164 Details for Bug 12897 – Return p->name instead of p->value (untested)

[patch] Return p->name instead of p->value (untested)

libX11-1.1.3-GetSetIMValues.diff (text/plain), 1.19 KB, created by Yann Droneaud on 2007-10-23 09:20:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yann Droneaud

Created: 2007-10-23 09:20:20 UTC

Size: 1.19 KB

patch

obsolete

>--- libX11-1.1.3/modules/im/ximcp/imRm.c~	2007-05-17 18:58:31.000000000 +0200
>+++ libX11-1.1.3/modules/im/ximcp/imRm.c	2007-10-23 18:11:05.000000000 +0200
>@@ -2265,17 +2265,17 @@ _XimSetIMValueData(
> 
>     for(p = values; p->name != NULL; p++) {
> 	if(!(res = _XimGetResourceListRec(res_list, list_num, p->name))) {
>-	    return p->value;
>+	    return p->name;
> 	}
> 	check = _XimCheckIMMode(res, XIM_SETIMVALUES);	
> 	if(check == XIM_CHECK_INVALID) {
> 	    continue;
> 	} else if (check == XIM_CHECK_ERROR) {
>-	    return p->value;
>+	    return p->name;
> 	}
> 	    
> 	if(!_XimEncodeLocalIMAttr(res, top, p->value)) {
>-	    return p->value;
>+	    return p->name;
> 	}
>     }
>     return NULL;
>@@ -2295,17 +2295,17 @@ _XimGetIMValueData(
> 
>     for(p = values; p->name != NULL; p++) {
> 	if(!(res = _XimGetResourceListRec(res_list, list_num, p->name))) {
>-	    return p->value;
>+	    return p->name;
> 	}
> 	check = _XimCheckIMMode(res, XIM_GETIMVALUES);	
> 	if(check == XIM_CHECK_INVALID) {
> 	    continue;
> 	} else if (check == XIM_CHECK_ERROR) {
>-	    return p->value;
>+	    return p->name;
> 	}
> 	    
> 	if(!_XimDecodeLocalIMAttr(res, top, p->value)) {
>-	    return p->value;
>+	    return p->name;
> 	}
>     }
>     return NULL;

Actions: View | Splinter Review

Attachments on bug 12897: 12164 | 41259

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.