fixed stray quote character appearing after encoding mail headers.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1470 ee746299-78ed-0310-b773-934348b2243d

1 files changed, 14 insertions, 7 deletions

diff --git a/libsylph/codeconv.c b/libsylph/codeconv.c
index 6a16513c..605849d9 100644
--- a/libsylph/codeconv.c
+++ b/libsylph/codeconv.c
@@ -2175,6 +2175,8 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
 	left = MAX_LINELEN - header_len;
 
 	while (*srcp) {
+		gboolean in_quote = FALSE;
+
 		LBREAK_IF_REQUIRED(left <= 0, TRUE);
 
 		while (g_ascii_isspace(*srcp)) {
@@ -2219,13 +2221,18 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
 			gboolean cont = FALSE;
 
 			while (*p != '\0') {
-				if (g_ascii_isspace(*p) &&
-				    !is_next_nonascii(p + 1))
-					break;
-				/* don't include parentheses in encoded
-				   strings */
-				if (addr_field && (*p == '(' || *p == ')'))
-					break;
+				if (*p == '"')
+					in_quote ^= TRUE;
+				else if (!in_quote) {
+					if (g_ascii_isspace(*p) &&
+					    !is_next_nonascii(p + 1))
+						break;
+					/* don't include parentheses in encoded
+					   strings */
+					if (addr_field &&
+					    (*p == '(' || *p == ')'))
+						break;
+				}
 
 				mb_len = g_utf8_skip[*(guchar *)p];