5e0fe..aa09c (2010-02-19 19:10)
(2010-02-19 21:11) eb81f..5de9c
Author: Claes NästénDate: Fri Feb 19 19:53:28 +0100 2010
Subject: Add call to iconvctl ref #201 to handle invalid iconv data.
| configure.ac | |
| 35 | @@ -35,6 +35,9 @@ |
| 35 | LIBS="$LIBS $LIBICONV" |
| 36 | CXXFLAGS="$CXXFLAGS $INCICONV" |
| 37 | |
| 38 | dnl Check for iconvctl |
| 39 | AC_CHECK_FUNC(iconvctl, [AC_DEFINE(HAVE_ICONVCTL, [1], [Define to 1 if you the iconvctl call])], ) |
| 40 | |
| 41 | dnl add x11 to the env |
| 42 | AC_PATH_X |
| 43 | AC_PATH_XTRA |
| ... | |
| src/Util.cc | |
| 415 | @@ -415,9 +415,13 @@ |
| 415 | for (unsigned int i = 0; from_names[i]; ++i) { |
| 416 | for (unsigned int j = 0; to_names[j]; ++j) { |
| 417 | ic = iconv_open (to_names[j], from_names[i]); |
| 418 | if (ic != reinterpret_cast<iconv_t>(-1)) { |
| 419 | return ic; |
| 420 | } |
| 421 | if (ic != reinterpret_cast<iconv_t>(-1)) { |
| 422 | #ifdef HAVE_ICONVCTL |
| 423 | int int_value_one = 1; |
| 424 | iconvctl(ic, ICONV_SET_DISCARD_ILSEQ, &int_value_one); |
| 425 | #endif // HAVE_ICONVCTL |
| 426 | return ic; |
| 427 | } |
| 428 | } |
| 429 | } |
| 430 | |
| ... | |
| Makefile.am | |
| 2 | @@ -2,7 +2,10 @@ |
| 2 | |
| 3 | SUBDIRS = src data doc contrib |
| 4 | |
| 5 | EXTRA_DIST = LICENSE ChangeLog.aewm++ ChangeLog.until-0.1.6 autogen.sh |
| 6 | EXTRA_DIST = LICENSE ChangeLog.aewm++ ChangeLog.until-0.1.6 autogen.sh pekwm.spec.in pekwm.spec |
| 7 | |
| 8 | dist-hook: |
| 9 | @SED@ -e 's:<VERSION>:$(VERSION):g' $(distdir)/pekwm.spec.in > $(distdir)/pekwm.spec |
| 10 | |
| 11 | distclean-local: |
| 12 | rm -f *\~ .\#* |
| ... | |