From 1312f9e524cb994de217437f493d6f56394bfbca Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Tue, 11 Feb 2003 08:20:01 +0000 Subject: [PATCH] sync with 0.8.10cvs7 --- ChangeLog | 7 +++++++ ChangeLog.claws | 5 +++++ configure.ac | 2 +- src/codeconv.c | 4 ++-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 345db4af1..2813341b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-02-09 + + * src/codeconv.c: + LBREAK_IF_REQUIRED(): don't break lines before first word (fixes + X-Face header problem). + conv_encode_header(): allow up to 97 characters for one word. + 2003-02-07 * src/filter.c: filter_match_condition(): fixed the bug that diff --git a/ChangeLog.claws b/ChangeLog.claws index 2ad4e0a46..997e25649 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,8 @@ +2003-02-11 [paul] 0.8.9claws53 + + * sync with 0.8.10cvs7 + see ChangeLog 2003-02-09 + 2003-02-11 [melvin] 0.8.9claws52 * po/fr.po diff --git a/configure.ac b/configure.ac index f3de7605b..2faf8ea56 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=8 MICRO_VERSION=9 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws52 +EXTRA_VERSION=claws53 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target diff --git a/src/codeconv.c b/src/codeconv.c index 67ca371a6..ae59dbcdd 100644 --- a/src/codeconv.c +++ b/src/codeconv.c @@ -1238,7 +1238,7 @@ void conv_unmime_header(gchar *outbuf, gint outlen, const gchar *str, destp--; \ else if (plaintext && isspace(*srcp)) \ srcp++; \ - if (*srcp) { \ + if (destp > dest && *srcp) { \ *destp++ = '\n'; \ *destp++ = ' '; \ left = MAX_LINELEN - 1; \ @@ -1294,7 +1294,7 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src, word_len = get_next_word_len(srcp); LBREAK_IF_REQUIRED(left < word_len, TRUE); while (word_len > 0) { - LBREAK_IF_REQUIRED(left <= 0, TRUE); + LBREAK_IF_REQUIRED(left + 22 <= 0, TRUE); *destp++ = *srcp++; left--; word_len--; -- 2.25.1