Package: icewm
Version: 1.2.26-2
Followup-For: Bug #360688
I made new patch for 1.2.26.
Please apply it.
Regards,
--
dai
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16
Locale: LANG=ja_JP.EUC-JP, LC_CTYPE=ja_JP.EUC-JP (charmap=EUC-JP) (ignored:
LC_ALL set to ja_JP.EUC-JP)
Versions of packages icewm depends on:
ii icewm-common 1.2.26-2 wonderful Win95-OS/2-Motif-like wi
ii imlib11 1.9.14-30 Imlib is an imaging library for X
ii libaudiofile0 0.2.6-6 Open-source version of SGI's audio
ii libc6 2.3.6-9 GNU C Library: Shared libraries
ii libesd-alsa0 [libesd0] 0.2.36-3 Enlightened Sound Daemon (ALSA) -
ii libfontconfig1 2.3.2-5.1vd1 generic font configuration library
ii libfreetype6 2.2.1-2 FreeType 2 font engine, shared lib
ii libgcc1 1:4.1.0-4 GCC support library
ii libice6 1:1.0.0-3 X11 Inter-Client Exchange library
ii libjpeg62 6b-13 The Independent JPEG Group's JPEG
ii libpng12-0 1.2.8rel-5.1 PNG library - runtime
ii libsm6 1:1.0.0-4 X11 Session Management library
ii libtiff4 3.8.2-2 Tag Image File Format (TIFF) libra
ii libungif4g 4.1.4-2 shared library for GIF images (run
ii libx11-6 2:1.0.0-6 X11 client-side library
ii libxext6 1:1.0.0-4 X11 miscellaneous extension librar
ii libxft2 2.1.8.2-7 FreeType-based font drawing librar
ii libxinerama1 1:1.0.1-4 X11 Xinerama extension library
ii libxrandr2 2:1.1.0.2-4 X11 RandR extension library
ii libxrender1 1:0.9.0.2-4 X Rendering Extension client libra
ii zlib1g 1:1.2.3-11 compression library - runtime
icewm recommends no packages.
-- no debconf information
diff -urNad icewm-1.2.26~/src/ypaint.cc icewm-1.2.26/src/ypaint.cc
--- icewm-1.2.26~/src/ypaint.cc 2006-04-17 01:12:31.000000000 +0900
+++ icewm-1.2.26/src/ypaint.cc 2006-05-22 18:39:25.000000000 +0900
@@ -465,14 +465,19 @@
#ifdef CONFIG_I18N
if (multiByte) {
int nc = mblen(str + c, len - c);
- if (nc < 1) // bad things
+ if (nc < 1) { // bad things
c++;
- else
+ cp++;
+ } else {
c += nc;
+ cp += nc;
+ }
} else
#endif
+ {
c++;
- cp++;
+ cp++;
+ }
}
// msg("%d %d %d %d %d", c, cp, charPos, left, right);
