7930becaf6
- Convert ConvDesc and ModeTable to a linked list, deprecate complex
realloc-based memory management.
- Add missing "${CAT} ${PKGMESSAGE}" in the post-install target.
- Regenerate patches.
28 lines
931 B
C
28 lines
931 B
C
Index: lib/CcWnn.c
|
||
===================================================================
|
||
RCS file: /home/cvs/private/hrs/kinput2/lib/CcWnn.c,v
|
||
retrieving revision 1.1.1.1
|
||
retrieving revision 1.2
|
||
diff -u -p -r1.1.1.1 -r1.2
|
||
--- lib/CcWnn.c 7 Dec 2009 06:36:04 -0000 1.1.1.1
|
||
+++ lib/CcWnn.c 7 Dec 2009 06:44:58 -0000 1.2
|
||
@@ -18,6 +18,8 @@ static char *rcsid = "$Id: CcWnn.c,v 1.5
|
||
* Author: Makoto Ishisone, Software Research Associates, Inc., Japan
|
||
*/
|
||
|
||
+#include <stdlib.h>
|
||
+
|
||
#include <X11/IntrinsicP.h>
|
||
#include <X11/StringDefs.h>
|
||
#include <X11/Xmu/Atoms.h>
|
||
@@ -854,6 +856,10 @@ CcWnnObject obj;
|
||
* $B$G!"3P$($F$*$/!#(B
|
||
*/
|
||
current_obj = obj;
|
||
+ /* Use JSERVER if defined instead of any other configurations */
|
||
+ if (getenv("JSERVER") != NULL) {
|
||
+ obj->ccWnn.jservername = getenv("JSERVER");
|
||
+ }
|
||
obj->ccWnn.wnnbuf = jcOpen2(obj->ccWnn.jservername,
|
||
obj->ccWnn.wnnenvname,
|
||
obj->ccWnn.wnnoverrideenv,
|