diff options
author | Eitan Adler <eadler@FreeBSD.org> | 2013-11-04 01:01:18 +0000 |
---|---|---|
committer | Eitan Adler <eadler@FreeBSD.org> | 2013-11-04 01:01:18 +0000 |
commit | ba4071189a85b5bb4850d2ce901e334104746ecf (patch) | |
tree | 1edb6092b1f3af04d6d7ecb0a9c56c3cdf2b85a7 | |
parent | 9aef5c6de586d5849963564e2ea1ceeaa78b685d (diff) |
Notes
-rw-r--r-- | x11-wm/icewm/files/patch-src_ylocale.cc | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/x11-wm/icewm/files/patch-src_ylocale.cc b/x11-wm/icewm/files/patch-src_ylocale.cc index 1a200211225b..d76d2f4ea589 100644 --- a/x11-wm/icewm/files/patch-src_ylocale.cc +++ b/x11-wm/icewm/files/patch-src_ylocale.cc @@ -1,6 +1,20 @@ ---- src/ylocale.cc.orig Mon Aug 7 03:38:14 2006 -+++ src/ylocale.cc Tue Aug 8 01:00:33 2006 -@@ -149,7 +149,8 @@ +--- src/ylocale.cc.orig 2013-11-03 19:58:39.180727369 -0500 ++++ src/ylocale.cc 2013-11-03 19:58:51.540725980 -0500 +@@ -126,8 +126,12 @@ YLocale::~YLocale() { + iconv_t YLocale::getConverter (const char *from, const char **&to) { + iconv_t cd = (iconv_t) -1; + ++ char *myfrom = (char *)malloc(1 + strlen(from)); ++ strcpy(myfrom, from); ++ char *modptr = strstr(myfrom, "//"); ++ if (NULL != modptr) *modptr = '\0'; + while (NULL != *to) +- if ((iconv_t) -1 != (cd = iconv_open(*to, from))) return cd; ++ if ((iconv_t) -1 != (cd = iconv_open(*to, myfrom))) return cd; + else ++to; + + return (iconv_t) -1; +@@ -149,7 +153,8 @@ YUChar *YLocale::unicodeString(const YLC return NULL; YUChar * uStr(new YUChar[lLen + 1]); |