From 3a0b2e5da02c7b8372a63676076471e8c38c67a0 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 15 Feb 2005 07:41:11 +0000 Subject: [PATCH] 2005-02-15 [colin] 1.0.1cvs7.1 * src/compose.c * src/procmime.c Sync with HEAD --- ChangeLog-gtk2.claws | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 2 +- src/procmime.c | 4 ++-- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 074e94fea..05d79cbe4 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2005-02-15 [colin] 1.0.1cvs7.1 + + * src/compose.c + * src/procmime.c + Sync with HEAD + 2005-02-14 [colin] 1.0.1cvs6.1 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index 863cdeb7c..28de59564 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -378,3 +378,4 @@ ( cvs diff -u -r 1.96.2.46 -r 1.96.2.47 src/textview.c; ) > 1.0.1cvs5.2.patchset ( cvs diff -u -r 1.382.2.99 -r 1.382.2.100 src/compose.c; ) > 1.0.1cvs5.3.patchset ( cvs diff -u -r 1.382.2.100 -r 1.382.2.101 src/compose.c; cvs diff -u -r 1.49.2.32 -r 1.49.2.33 src/procmime.c; ) > 1.0.1cvs6.1.patchset +( cvs diff -u -r 1.382.2.101 -r 1.382.2.102 src/compose.c; cvs diff -u -r 1.49.2.33 -r 1.49.2.34 src/procmime.c; ) > 1.0.1cvs7.1.patchset diff --git a/configure.ac b/configure.ac index 9dab42c89..265ddf552 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=6 +EXTRA_VERSION=7 EXTRA_RELEASE= EXTRA_GTK2_VERSION=.1 diff --git a/src/compose.c b/src/compose.c index 70b5e108b..07a9a15a8 100644 --- a/src/compose.c +++ b/src/compose.c @@ -3644,7 +3644,7 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action) g_free(chars); if (encoding == ENC_8BIT || encoding == ENC_7BIT) { - if (!strncmp(buf, "From ", strlen("From ")) || + if (!strncmp(buf, "From ", sizeof("From ")-1) || strstr(buf, "\nFrom ") != NULL) { encoding = ENC_QUOTED_PRINTABLE; } diff --git a/src/procmime.c b/src/procmime.c index a4267d743..306789329 100644 --- a/src/procmime.c +++ b/src/procmime.c @@ -478,10 +478,10 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding) while (fgets(inbuf, sizeof(inbuf), infp) != NULL) { qp_encode_line(outbuf, inbuf); - if (!strncmp("From ", outbuf, strlen("From "))) { + if (!strncmp("From ", outbuf, sizeof("From ")-1)) { gchar *tmpbuf = outbuf; - tmpbuf += strlen("From "); + tmpbuf += sizeof("From ")-1; fputs("=46rom ", outfp); fputs(tmpbuf, outfp); -- 2.25.1