talons

commit e63ed92c9aaa6a6822aa6eafdbcfc55394e96d73
parent 0da1365a38e19c619215d919598a3704d49936e3
Author: Paul <paul@claws-mail.org>
Date:   Tue, 14 May 2024 08:20:17 +0100

better fix for bug 4798

Diffstat:
M
src/procmime.c
 | 
15
+++++++++------

1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/procmime.c b/src/procmime.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2024 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2023 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -273,15 +273,18 @@ const gchar *procmime_mimeinfo_get_parameter(MimeInfo *mimeinfo, const gchar *na
 		strretchomp(lastline);						\
 		llen = strlen(lastline);					\
 		if (lastline[llen-1] == ' ' && !account_sigsep_matchlist_str_found(lastline, "%s") &&	\
-		    !(llen == 2 && lastline[1] == ' ' && strchr(prefs_common.quote_chars, lastline[0]))) { \
+		    !(llen >= 2 && lastline[1] == ' ' && strchr(prefs_common.quote_chars, lastline[0]))) {					\
 			/* this is flowed */					\
 			if (delsp)						\
 				lastline[llen-1] = '\0';			\
+			if (claws_fputs(lastline, outfp) == EOF)			\
+				err = TRUE;					\
+		} else {							\
+			if (claws_fputs(lastline, outfp) == EOF)			\
+				err = TRUE;					\
+			if (claws_fputs("\n", outfp) == EOF)				\
+				err = TRUE;					\
 		}								\
-		if (claws_fputs(lastline, outfp) == EOF)			\
-			err = TRUE;						\
-		if (claws_fputs("\n", outfp) == EOF)				\
-			err = TRUE;						\
 	} 									\
 	strcpy(lastline, buf);							\
 }