summaryrefslogtreecommitdiff
path: root/src/xlibi18n/lcPrTxt.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xlibi18n/lcPrTxt.c')
-rw-r--r--src/xlibi18n/lcPrTxt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xlibi18n/lcPrTxt.c b/src/xlibi18n/lcPrTxt.c
index 8998ff21..9078b9be 100644
--- a/src/xlibi18n/lcPrTxt.c
+++ b/src/xlibi18n/lcPrTxt.c
@@ -23,7 +23,7 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcPrTxt.c,v 1.8 2002/06/03 22:36:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcPrTxt.c,v 1.10 2003/05/29 13:22:51 pascal Exp $ */
#include "Xlibint.h"
#include "XlcPubI.h"
@@ -154,7 +154,6 @@ _XTextPropertyToTextList(
buf_len = text_prop->nitems * 6 + 1;
else
buf_len = text_prop->nitems * XLC_PUBLIC(lcd, mb_cur_max) + 1;
- buf = (XPointer) Xmalloc(buf_len);
}
buf = (XPointer) Xmalloc(buf_len);
if (buf == NULL)
@@ -213,7 +212,8 @@ _XTextPropertyToTextList(
to++;
to_left--;
}
- _XlcResetConverter(conv);
+ if (! do_strcpy)
+ _XlcResetConverter(conv);
} else
str_ptr++;