[Commits] [SCM] claws branch, gtk2, updated. 3.20.0-90-ge7606c3a8

[paul at claws-mail.org]

The branch, gtk2 has been updated
       via  e7606c3a88bed6b9979828046612f09d43210c8a (commit)
       via  c8e769dabe2f1de75ff3a151e5af6a927d67dbcd (commit)
      from  edea4b77119be05b5b1e0694b594967e718d8da7 (commit)

Summary of changes:
 src/procmime.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit e7606c3a88bed6b9979828046612f09d43210c8a
Author: Paul <paul at claws-mail.org>
Date:   Tue May 14 08:21:19 2024 +0100

    fix year reversal in last commit

diff --git a/src/procmime.c b/src/procmime.c
index adc8f0d23..627b91f83 100644
--- 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-2023 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2024 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

commit c8e769dabe2f1de75ff3a151e5af6a927d67dbcd
Author: Paul <paul at claws-mail.org>
Date:   Tue May 14 08:20:17 2024 +0100

    better fix for bug 4798

diff --git a/src/procmime.c b/src/procmime.c
index d2524cba4..adc8f0d23 100644
--- 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);							\
 }

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail