From a1a9c7254da998d0f557bf0ad3aae0b5d5d9d94b Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 20 Jul 2004 18:59:39 +0000 Subject: [PATCH] fix header encoding --- ChangeLog-gtk2.claws | 8 ++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/codeconv.c | 5 ++--- src/compose.c | 4 ++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index a76cd8784..63a77850b 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,11 @@ +2004-07-20 [colin] 0.9.12cvs33.9 + + * src/codeconv.c + conv_encode_header: src_charset is UTF-8 on + gtk2 + * src/compose.c + Remove double encoding of the headers + 2004-07-20 [colin] 0.9.12cvs33.8 * src/codeconv.c diff --git a/PATCHSETS b/PATCHSETS index 225d70e8c..adf19fc40 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -62,3 +62,4 @@ ( cvs diff -u -r 1.15.2.2 -r 1.15.2.3 src/codeconv.h; ) > 0.9.12cvs33.6.patchset ( cvs diff -u -r 1.274.2.10 -r 1.274.2.11 src/mainwindow.c; ) > 0.9.12cvs33.7.patchset ( cvs diff -u -r 1.65.2.8 -r 1.65.2.9 src/codeconv.c; ) > 0.9.12cvs33.8.patchset +( cvs diff -u -r 1.65.2.9 -r 1.65.2.10 src/codeconv.c; cvs diff -u -r 1.382.2.29 -r 1.382.2.30 src/compose.c; ) > 0.9.12cvs33.9.patchset diff --git a/configure.ac b/configure.ac index 9e01de43c..a1248bff5 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ INTERFACE_AGE=0 BINARY_AGE=0 EXTRA_VERSION=33 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.8 +EXTRA_GTK2_VERSION=.9 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/src/codeconv.c b/src/codeconv.c index b1e4b2c9d..1c3cd3934 100644 --- a/src/codeconv.c +++ b/src/codeconv.c @@ -1511,9 +1511,8 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src, mimesep_enc = "?Q?"; } - cur_encoding = conv_get_current_charset_str(); - if (!strcmp(cur_encoding, CS_US_ASCII)) - cur_encoding = CS_ISO_8859_1; + cur_encoding = CS_UTF_8; /* gtk2 */ + out_encoding = conv_get_outgoing_charset_str(); if (!strcmp(out_encoding, CS_US_ASCII)) out_encoding = CS_ISO_8859_1; diff --git a/src/compose.c b/src/compose.c index da29ffd02..2381d6b9a 100644 --- a/src/compose.c +++ b/src/compose.c @@ -4660,8 +4660,8 @@ static void compose_convert_header(gchar *dest, gint len, gchar *src, g_return_if_fail(dest != NULL); if (len < 1) return; - - tmpstr = conv_codeset_strdup(src, CS_UTF_8, conv_get_outgoing_charset_str()); + + tmpstr = strdup(src); subst_char(tmpstr, '\n', ' '); subst_char(tmpstr, '\r', ' '); -- 2.25.1