--- np2/x11/gtk2/gtk_font.c 2004/07/15 14:24:33 1.2 +++ np2/x11/gtk2/gtk_font.c 2005/03/12 12:36:57 1.4 @@ -1,4 +1,4 @@ -/* $Id: gtk_font.c,v 1.2 2004/07/15 14:24:33 monaka Exp $ */ +/* $Id: gtk_font.c,v 1.4 2005/03/12 12:36:57 monaka Exp $ */ /* * Copyright (c) 2004 NONAKA Kimihiro @@ -12,8 +12,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -313,7 +311,7 @@ fontmng_get(void *hdl, const char *str) } if (((((str[0] ^ 0x20) - 0xa1) & 0xff) < 0x3c) && (str[1] != '\0')) { - codecnv_sjis2euc(buf, 4, str, 2); + codecnv_sjistoeuc(buf, 4, str, 2); len = 2; } else if ((UINT8)str[0] >= 0xa1 && (UINT8)str[0] <= 0xdf) { buf[0] = 0x8e;