Attachment 1758 Details for Bug 2392 – see above (patch supplied by Marcus Meissner)

[patch] see above (patch supplied by Marcus Meissner)

diff.sentinel (text/plain), 2.94 KB, created by Egbert Eich on 2005-01-27 02:20:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2005-01-27 02:20:42 UTC

Size: 2.94 KB

patch

obsolete

>--- lib/Xaw/XawIm.c.xx	2005-01-27 08:22:50.431669685 +0100
>+++ lib/Xaw/XawIm.c	2005-01-27 08:24:59.944779696 +0100
>@@ -731,7 +731,7 @@
>     ic_a[ic_cnt] = (XPointer) NULL;
> 
>     if (ic_cnt > 0) {
>-	XGetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], ic_a[4]);
>+	XGetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], NULL);
> 	if (pe_attr) XFree(pe_attr);
> 	if (st_attr) XFree(st_attr);
> 	if (p->xic == NULL) {
>@@ -771,7 +771,7 @@
> 	    ic_a[ic_cnt] = (XPointer) pe_attr; ic_cnt++;
> 	}
> 	ic_a[ic_cnt] = (XPointer) NULL;
>-	XSetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], ic_a[4]);
>+	XSetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], NULL);
> 	if (pe_attr) XFree(pe_attr);
> 	if (st_attr) XFree(st_attr);
> 	if (p->xic == NULL) {
>@@ -889,7 +889,7 @@
> 				   pe_a[4], pe_a[5], pe_a[6], pe_a[7], pe_a[8],
> 				   pe_a[9], pe_a[10], pe_a[11], pe_a[12],
> 				   pe_a[13], pe_a[14], pe_a[15], pe_a[16],
>-				   pe_a[17], pe_a[18],  pe_a[19]);
>+				   pe_a[17], pe_a[18],  NULL);
> 	ic_a[ic_cnt] = (XPointer) XNPreeditAttributes; ic_cnt++;
> 	ic_a[ic_cnt] = (XPointer) pe_attr; ic_cnt++;
>     }
>@@ -900,7 +900,7 @@
> 				   st_a[4], st_a[5], st_a[6], st_a[7], st_a[8],
> 				   st_a[9], st_a[10], st_a[11], st_a[12],
> 				   st_a[13], st_a[14], st_a[15], st_a[16],
>-				   st_a[17], st_a[18],  st_a[19]);
>+				   st_a[17], st_a[18],  NULL);
> 	ic_a[ic_cnt] = (XPointer) XNStatusAttributes; ic_cnt++;
> 	ic_a[ic_cnt] = (XPointer) st_attr; ic_cnt++;
>     }
>@@ -909,7 +909,7 @@
>     p->xic = XCreateIC(ve->im.xim, ic_a[0], ic_a[1], ic_a[2], ic_a[3],
> 		       ic_a[4], ic_a[5], ic_a[6], ic_a[7], ic_a[8], ic_a[9],
> 		       ic_a[10], ic_a[11], ic_a[12], ic_a[13], ic_a[14],
>-		       ic_a[15], ic_a[16], ic_a[17], ic_a[18], ic_a[19]);
>+		       ic_a[15], ic_a[16], ic_a[17], ic_a[18], NULL);
>     if (pe_attr) XtFree(pe_attr);
>     if (st_attr) XtFree(st_attr);
> 
>@@ -1027,7 +1027,7 @@
> 				      pe_a[4], pe_a[5], pe_a[6], pe_a[7],
> 				      pe_a[8], pe_a[9], pe_a[10], pe_a[11],
> 				      pe_a[12], pe_a[13], pe_a[14], pe_a[15],
>-				      pe_a[16], pe_a[17], pe_a[18],  pe_a[19]);
>+				      pe_a[16], pe_a[17], pe_a[18],  NULL);
> 	ic_a[ic_cnt] = (XPointer) XNPreeditAttributes; ic_cnt++;
> 	ic_a[ic_cnt] = (XPointer) pe_attr; ic_cnt++;
>     }
>@@ -1037,7 +1037,7 @@
> 				      st_a[4], st_a[5], st_a[6], st_a[7],
> 				      st_a[8], st_a[9], st_a[10], st_a[11],
> 				      st_a[12], st_a[13], st_a[14], st_a[15],
>-				      st_a[16], st_a[17], st_a[18],  st_a[19]);
>+				      st_a[16], st_a[17], st_a[18],  NULL);
> 	ic_a[ic_cnt] = (XPointer) XNStatusAttributes; ic_cnt++;
> 	ic_a[ic_cnt] = (XPointer) st_attr; ic_cnt++;
>     }
>@@ -1050,7 +1050,7 @@
> 	XSetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], ic_a[4],
> 		     ic_a[5], ic_a[6], ic_a[7], ic_a[8], ic_a[9], ic_a[10],
> 		     ic_a[11], ic_a[12], ic_a[13], ic_a[14], ic_a[15],
>-		     ic_a[16], ic_a[17], ic_a[18], ic_a[19]);
>+		     ic_a[16], ic_a[17], ic_a[18], NULL);
> 	if (pe_attr) XtFree(pe_attr);
> 	if (st_attr) XtFree(st_attr);
>     }

Actions: View | Splinter Review

Attachments on bug 2392: 1758

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.