From: Colin Leroy Date: Wed, 12 Oct 2005 18:04:24 +0000 (+0000) Subject: 2005-10-12 [colin] 1.9.15cvs32 X-Git-Tag: rel_1_9_99~105 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=8825ed88dce45acbecb4d4b1513a97a1cabb7d21;ds=sidebyside 2005-10-12 [colin] 1.9.15cvs32 * src/compose.c Remove old hack of encoding signed mails with base64. QP works equally well. --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 7fa6a3af3..ccbb946c0 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2005-10-12 [colin] 1.9.15cvs32 + + * src/compose.c + Remove old hack of encoding signed mails with base64. + QP works equally well. + 2005-10-12 [colin] 1.9.15cvs31 * src/crash.c diff --git a/PATCHSETS b/PATCHSETS index b944471d7..ab3872851 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -868,3 +868,4 @@ ( cvs diff -u -r 1.382.2.181 -r 1.382.2.182 src/compose.c; ) > 1.9.15cvs29.patchset ( cvs diff -u -r 1.207.2.70 -r 1.207.2.71 src/folderview.c; cvs diff -u -r 1.179.2.76 -r 1.179.2.77 src/imap.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/imap_gtk.c; ) > 1.9.15cvs30.patchset ( cvs diff -u -r 1.23.2.13 -r 1.23.2.14 src/crash.c; cvs diff -u -r 1.179.2.77 -r 1.179.2.78 src/imap.c; cvs diff -u -r 1.274.2.72 -r 1.274.2.73 src/mainwindow.c; cvs diff -u -r 1.83.2.40 -r 1.83.2.41 src/mimeview.c; cvs diff -u -r 1.101.2.17 -r 1.101.2.18 src/news.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_image_viewer.c; cvs diff -u -r 1.395.2.134 -r 1.395.2.135 src/summaryview.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/wizard.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/prefs_gpg.c; ) > 1.9.15cvs31.patchset +( cvs diff -u -r 1.382.2.182 -r 1.382.2.183 src/compose.c; ) > 1.9.15cvs32.patchset diff --git a/configure.ac b/configure.ac index 493899f1f..fe0d7e898 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=15 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=31 +EXTRA_VERSION=32 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/compose.c b/src/compose.c index f2218ea96..d7e43829d 100644 --- a/src/compose.c +++ b/src/compose.c @@ -3911,10 +3911,7 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action) /* protect trailing spaces when signing message */ if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing && privacy_system_can_sign(compose->privacy_system)) { - if (encoding == ENC_7BIT) - encoding = ENC_QUOTED_PRINTABLE; - else if (encoding == ENC_8BIT) - encoding = ENC_BASE64; + encoding = ENC_QUOTED_PRINTABLE; } /* check for line length limit */