fix header encoding

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index a76cd878413b190bca9e6c999aff760898d5107f..63a77850be348a7fa5cd91d6efe3fd7825a10525 100644 (file)
--- 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 225d70e8c9e38a9ee6eff65b1a25cb4a40b0e6e6..adf19fc40be58847ca0db81087662492ab16f3a6 100644 (file)
--- 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 9e01de43c4dc366d09fd950cc40c9b74f8175aee..a1248bff5c9f614225cef7ca018fbc349ac0b3c6 100644 (file)
--- 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 b1e4b2c9d3a285c8efe6180417a46ecd00242364..1c3cd3934a65474db304b529f01dbf0918aed8c9 100644 (file)
--- 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 da29ffd02f2271ac185cad307769cff4e61f6f64..2381d6b9ad26792c4fe0d68410b034be7191e816 100644 (file)
--- 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', ' ');