talons

commit 6691eef7ecb005fb1cdd6e47b4e4dd0e4fda9f7b
parent ba291dc1bba839bb195530ca9beb7e1eb8317033
Author: Colin Leroy <colin@colino.net>
Date:   Tue,  8 Nov 2011 16:09:27 +0000

2011-11-08 [colin]	3.7.10cvs79

	* src/codeconv.c
		Make sure we break line when we need to. Very probably
		fixes bug #2310 "Crash when hitting Ctrl+R to reply to a
		particular mail"

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/codeconv.c
 | 
1
+

4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-08 [colin]	3.7.10cvs79
+
+	* src/codeconv.c
+		Make sure we break line when we need to. Very probably
+		fixes bug #2310 "Crash when hitting Ctrl+R to reply to a 
+		particular mail"
+
 2011-11-07 [pawel]	3.7.10cvs78
 
 	* src/imap_gtk.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4282,3 +4282,4 @@
 ( cvs diff -u -r 1.274.2.334 -r 1.274.2.335 src/mainwindow.c;  ) > 3.7.10cvs76.patchset
 ( cvs diff -u -r 1.83.2.178 -r 1.83.2.179 src/mimeview.c;  cvs diff -u -r 1.96.2.235 -r 1.96.2.236 src/textview.c;  cvs diff -u -r 1.12.2.27 -r 1.12.2.28 src/textview.h;  ) > 3.7.10cvs77.patchset
 ( cvs diff -u -r 1.1.2.66 -r 1.1.2.67 src/imap_gtk.c;  ) > 3.7.10cvs78.patchset
+( cvs diff -u -r 1.65.2.73 -r 1.65.2.74 src/codeconv.c;  ) > 3.7.10cvs79.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=78
+EXTRA_VERSION=79
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/codeconv.c b/src/codeconv.c
@@ -1693,6 +1693,7 @@ void conv_encode_header_full(gchar *dest, gint len, const gchar *src,
 					cur_len += mb_len;
 					p += mb_len;
 				} else if (cur_len == 0) {
+					left = 0;
 					LBREAK_IF_REQUIRED(1, FALSE);
 					continue;
 				} else {