From 00620d4417f3ae96618542b8a24af776787592d7 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 12 Oct 2004 16:51:16 +0000 Subject: [PATCH] 2004-10-12 [colin] 0.9.12cvs124.3 * src/compose.c Fix encoding bug from latest sync --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 49521aad5..94d14710a 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2004-10-12 [colin] 0.9.12cvs124.3 + + * src/compose.c + Fix encoding bug from latest sync + 2004-10-12 [paul] 0.9.12cvs124.2 * src/plugins/pgpmime/prefs_gpg.c diff --git a/PATCHSETS b/PATCHSETS index 345305c24..5038433c6 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -196,3 +196,4 @@ ( cvs diff -u -r 1.274.2.21 -r 1.274.2.22 src/mainwindow.c; cvs diff -u -r 1.94.2.31 -r 1.94.2.32 src/messageview.c; cvs diff -u -r 1.19.2.3 -r 1.19.2.4 src/messageview.h; cvs diff -u -r 1.96.2.19 -r 1.96.2.20 src/textview.c; ) > 0.9.12cvs122.1.patchset ( cvs diff -u -r 1.2504.2.23 -r 1.2504.2.24 ChangeLog.claws; cvs diff -u -r 1.654.2.228 -r 1.654.2.229 configure.ac; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 m4/spamassassin.m4; cvs diff -u -r 1.155.2.12 -r 1.155.2.13 src/Makefile.am; cvs diff -u -r 1.61.2.12 -r 1.61.2.13 src/account.c; cvs diff -u -r 1.382.2.48 -r 1.382.2.49 src/compose.c; cvs diff -u -r 1.50.2.5 -r 1.50.2.6 src/compose.h; cvs diff -u -r 1.23.2.5 -r 1.23.2.6 src/crash.c; cvs diff -u -r 1.115.2.19 -r 1.115.2.20 src/main.c; cvs diff -u -r 1.83.2.21 -r 1.83.2.22 src/mimeview.c; cvs diff -u -r -1.12.2.4 -r -1.12.2.5 src/passphrase.c; cvs diff -u -r -1.5 -r -1.6 src/passphrase.h; cvs diff -u -r 1.105.2.8 -r 1.105.2.9 src/prefs_account.c; cvs diff -u -r 1.49.2.4 -r 1.49.2.5 src/prefs_account.h; cvs diff -u -r 1.204.2.21 -r 1.204.2.22 src/prefs_common.c; cvs diff -u -r 1.10.2.1 -r 1.10.2.2 src/privacy.c; cvs diff -u -r 1.10.2.1 -r 1.10.2.2 src/privacy.h; cvs diff -u -r 1.49.2.9 -r 1.49.2.10 src/procmime.c; cvs diff -u -r 1.17.2.4 -r 1.17.2.5 src/procmime.h; cvs diff -u -r 1.150.2.9 -r 1.150.2.10 src/procmsg.c; cvs diff -u -r -1.30.2.2 -r -1.30.2.3 src/rfc2015.c; cvs diff -u -r -1.7.2.2 -r -1.7.2.3 src/rfc2015.h; cvs diff -u -r -1.7.2.2 -r -1.7.2.3 src/select-keys.c; cvs diff -u -r -1.1.1.1 -r -1.1.1.2 src/select-keys.h; cvs diff -u -r 1.96.2.20 -r 1.96.2.21 src/textview.c; cvs diff -u -r 1.36.2.7 -r 1.36.2.8 src/common/utils.c; cvs diff -u -r 1.20.2.6 -r 1.20.2.7 src/common/utils.h; cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/gtk/about.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/Makefile.am; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/passphrase.c; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/passphrase.h; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/plugin.c; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/select-keys.c; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/select-keys.h; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/sgpgme.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/sgpgme.h; ) > 0.9.12cvs124.1.patchset ( cvs diff -u -r 0 -r 1 src/plugins/pgpmime/prefs_gpg.c; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/prefs_gpg.h; ) > 0.9.12cvs124.2.patchset +( cvs diff -u -r 1.382.2.49 -r 1.382.2.50 src/compose.c; ) > 0.9.12cvs124.3.patchset diff --git a/configure.ac b/configure.ac index 579c4f2cb..ae047344b 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ INTERFACE_AGE=0 BINARY_AGE=0 EXTRA_VERSION=124 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.2 +EXTRA_GTK2_VERSION=.3 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/compose.c b/src/compose.c index c55dddec7..5453dd8c5 100644 --- a/src/compose.c +++ b/src/compose.c @@ -3535,7 +3535,7 @@ static gint compose_write_to_file(Compose *compose, FILE *fp) else encoding = procmime_get_encoding_for_charset(out_codeset); - src_codeset = conv_get_current_charset_str(); + src_codeset = CS_UTF_8; /* if current encoding is US-ASCII, set it the same as outgoing one to prevent code conversion failure */ if (!strcasecmp(src_codeset, CS_US_ASCII)) -- 2.25.1