From miras at claws-mail.org  Thu Feb  2 23:20:29 2023
From: miras at claws-mail.org (miras at claws-mail.org)
Date: Thu,  2 Feb 2023 23:20:29 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, master, updated. 4.1.1-36-geba27f8d5
Message-ID: <20230202232029.904C140136@claws-mail.org>

The branch, master has been updated
       via  eba27f8d59cfae9090e275cf57e5bb9ac9247dbf (commit)
      from  07f38db5b1a061859bbdbbdc521d7cd01a9f99ad (commit)

Summary of changes:
 src/plugins/litehtml_viewer/lh_widget.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit eba27f8d59cfae9090e275cf57e5bb9ac9247dbf
Author: Michael Rasmussen <mir at datanom.net>
Date:   Fri Feb 3 00:17:44 2023 +0100

    Fix for bug #4300 again. Initially committer    Andrej Kacian <ticho at claws-mail.org>
            Tue, 6 Aug 2019 09:46:01 +0100 (10:46 +0200)
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/plugins/litehtml_viewer/lh_widget.cpp b/src/plugins/litehtml_viewer/lh_widget.cpp
index 3c1259d0c..68658247d 100644
--- a/src/plugins/litehtml_viewer/lh_widget.cpp
+++ b/src/plugins/litehtml_viewer/lh_widget.cpp
@@ -144,7 +144,11 @@ void lh_widget::set_base_url(const litehtml::tchar_t* base_url)
 {
 	debug_print("lh_widget set_base_url '%s'\n",
 			(base_url ? base_url : "(null)"));
-	m_base_url = base_url;
+	if (base_url)
+		m_base_url = base_url;
+	else
+		m_base_url.clear();
+
 	return;
 }
 

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


hooks/post-receive
-- 
Claws Mail

From mir at datanom.net  Thu Feb  2 23:27:40 2023
From: mir at datanom.net (Michael Rasmussen)
Date: Fri, 3 Feb 2023 00:27:40 +0100
Subject: [Commits] [SCM] claws branch, master,
 updated. 4.1.1-36-geba27f8d5
In-Reply-To: <20230202232029.904C140136@claws-mail.org>
References: <20230202232029.904C140136@claws-mail.org>
Message-ID: <20230203002740.5127f1ff@sleipner.datanom.net>

On Thu,  2 Feb 2023 23:20:29 +0000 (UTC)
miras at claws-mail.org wrote:

> - Log
> -----------------------------------------------------------------
> commit eba27f8d59cfae9090e275cf57e5bb9ac9247dbf Author: Michael
> Rasmussen <mir at datanom.net> Date:   Fri Feb 3 00:17:44 2023 +0100
> 
>     Fix for bug #4300 again. Initially committer    Andrej Kacian
> <ticho at claws-mail.org> Tue, 6 Aug 2019 09:46:01 +0100 (10:46 +0200)
>     
>     Signed-off-by: Michael Rasmussen <mir at datanom.net>
> 
The commit was present in gtk2 so no need to recommit there. Possibly
missed when merging old master and gtk3?

-- 
Hilsen/Regards
Michael Rasmussen

Get my public GnuPG keys:
michael <at> rasmussen <dot> cc
https://pgp.key-server.io/pks/lookup?search=0xD3C9A00E
mir <at> datanom <dot> net
https://pgp.key-server.io/pks/lookup?search=0xE501F51C
mir <at> miras <dot> org
https://pgp.key-server.io/pks/lookup?search=0xE3E80917
--------------------------------------------------------------

'During times of universal deceit, telling the truth becomes a
revolutionary act.' -George Orwell

/usr/games/fortune -es says:
In the first place, God made idiots; this was for practice; then he made
school boards.
		-- Mark Twain
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.claws-mail.org/pipermail/commits/attachments/20230203/db8a8a4b/attachment.sig>

From paul at claws-mail.org  Mon Feb  6 14:08:07 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Mon,  6 Feb 2023 14:08:07 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, master, updated. 4.1.1-37-g681b0766c
Message-ID: <20230206140807.EE11340510@claws-mail.org>

The branch, master has been updated
       via  681b0766cfd81b748d09b8239726ade553e7deea (commit)
      from  eba27f8d59cfae9090e275cf57e5bb9ac9247dbf (commit)

Summary of changes:
 src/gtk/about.c                         | 5 +++++
 src/main.h                              | 3 ++-
 src/plugins/bogofilter/bogofilter.c     | 7 +++++--
 src/plugins/bsfilter/bsfilter.c         | 6 +++++-
 src/plugins/spamassassin/spamassassin.c | 6 +++++-
 5 files changed, 22 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 681b0766cfd81b748d09b8239726ade553e7deea
Author: Paul <paul at claws-mail.org>
Date:   Mon Feb 6 14:08:03 2023 +0000

    add spam stats to session stats

diff --git a/src/gtk/about.c b/src/gtk/about.c
index 54f9f897f..79b957440 100644
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -760,6 +760,11 @@ static void about_update_stats(void)
 					session_stats.received);
 		gtk_text_buffer_insert_with_tags_by_name(stats_text_buffer, &iter, buf, -1,
 				"indented-list-item", "bold", NULL);
+		if (session_stats.spam > 0) {
+			g_snprintf(buf, sizeof(buf), _("Spam messages: %d\n"), session_stats.spam);
+			gtk_text_buffer_insert_with_tags_by_name(stats_text_buffer, &iter, buf, -1,
+								 "indented-list-item", NULL);
+		}
 
 		gtk_text_buffer_insert(stats_text_buffer, &iter, "\n", 1);
 		gtk_text_buffer_insert_with_tags_by_name(stats_text_buffer, &iter,
diff --git a/src/main.h b/src/main.h
index 53b973211..901430b3d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
+ * 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
@@ -32,6 +32,7 @@ typedef struct _SessionStats SessionStats;
 struct _SessionStats
 {
 	gint received;
+	gint spam;
 	gint sent;
 	gint replied;
 	gint forwarded;
diff --git a/src/plugins/bogofilter/bogofilter.c b/src/plugins/bogofilter/bogofilter.c
index 8e4e7fc1f..03d037ee6 100644
--- a/src/plugins/bogofilter/bogofilter.c
+++ b/src/plugins/bogofilter/bogofilter.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2021 the Claws Mail team and Colin Leroy
+ * Copyright (C) 1999-2023 the Claws Mail team and Colin Leroy
  *
  * 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
@@ -45,6 +45,7 @@
 #include "prefs_gtk.h"
 
 #include "bogofilter.h"
+#include "main.h"
 #include "inc.h"
 #include "log.h"
 #include "prefs_common.h"
@@ -84,6 +85,8 @@ static MessageCallback message_callback;
 
 static BogofilterConfig config;
 
+extern SessionStats session_stats;
+
 static PrefParam param[] = {
 	{"process_emails", "TRUE", &config.process_emails, P_BOOL,
 	 NULL, NULL, NULL},
@@ -303,7 +306,7 @@ static void bogofilter_do_filter(BogoFilterData *data)
 								data->mail_filtering_data->filtered, msginfo);
 						}
 						data->new_spams = g_slist_prepend(data->new_spams, msginfo);
-
+						session_stats.spam++;
 					} else if (whitelisted && parts && parts[0] && parts[1] && 
 							(*parts[1] == 'S' || *parts[1] == 'U')) {
 
diff --git a/src/plugins/bsfilter/bsfilter.c b/src/plugins/bsfilter/bsfilter.c
index b4d59cb11..d7972cbe9 100644
--- a/src/plugins/bsfilter/bsfilter.c
+++ b/src/plugins/bsfilter/bsfilter.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2021 the Claws Mail team and
+ * Copyright (C) 1999-2023 the Claws Mail team and
  * Colin Leroy <colin at colino.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -48,6 +48,7 @@
 #include "utils.h"
 
 #include "bsfilter.h"
+#include "main.h"
 #include "inc.h"
 #include "log.h"
 #include "prefs_common.h"
@@ -83,6 +84,8 @@ static MessageCallback message_callback;
 
 static BsfilterConfig config;
 
+extern SessionStats session_stats;
+
 static PrefParam param[] = {
 	{"process_emails", "TRUE", &config.process_emails, P_BOOL,
 	 NULL, NULL, NULL},
@@ -340,6 +343,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
 	} else {
 		if (!whitelisted || (whitelisted && !config.learn_from_whitelist)) {
 			procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);
+			session_stats.spam++;
 			debug_print("flagging spam: %d\n", msginfo->msgnum);
 			filtered = TRUE;
 		}
diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index 19a188968..5ab8aa787 100644
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2021 the Claws Mail Team
+ * Copyright (C) 1999-2023 the Claws Mail Team
  *
  * 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
@@ -46,6 +46,7 @@
 
 #include "libspamc.h"
 #include "spamassassin.h"
+#include "main.h"
 #include "inc.h"
 #include "log.h"
 #include "prefs_common.h"
@@ -88,6 +89,8 @@ static MessageCallback message_callback;
 
 static SpamAssassinConfig config;
 
+extern SessionStats session_stats;
+
 static PrefParam param[] = {
 	{"enable", "FALSE", &config.enable, P_BOOL,
 	NULL, NULL, NULL},
@@ -297,6 +300,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
 	if (is_spam) {
 		debug_print("message is spam\n");
 		procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);
+		session_stats.spam++;
 		if (config.receive_spam) {
 			FolderItem *save_folder = NULL;
 

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Tue Feb  7 10:11:59 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Tue,  7 Feb 2023 10:11:59 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, gtk2, updated. 3.19.1-31-ga50dcf478
Message-ID: <20230207101159.B40DB4017D@claws-mail.org>

The branch, gtk2 has been updated
       via  a50dcf4781345bfb24769af86b842d33b051870b (commit)
      from  77725587c7b8add1b250dc1da4adf2aa3b0f0fe0 (commit)

Summary of changes:
 src/gtk/about.c                         | 5 +++++
 src/main.h                              | 5 +++--
 src/plugins/bogofilter/bogofilter.c     | 9 ++++++---
 src/plugins/bsfilter/bsfilter.c         | 8 ++++++--
 src/plugins/spamassassin/spamassassin.c | 8 ++++++--
 5 files changed, 26 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit a50dcf4781345bfb24769af86b842d33b051870b
Author: Paul <paul at claws-mail.org>
Date:   Mon Feb 6 14:08:03 2023 +0000

    add spam stats to session stats

diff --git a/src/gtk/about.c b/src/gtk/about.c
index 12a79ce6c..ae96ec0df 100644
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -756,6 +756,11 @@ static void about_update_stats(void)
 					session_stats.received);
 		gtk_text_buffer_insert_with_tags_by_name(stats_text_buffer, &iter, buf, -1,
 				"indented-list-item", "bold", NULL);
+		if (session_stats.spam > 0) {
+			g_snprintf(buf, sizeof(buf), _("Spam messages: %d\n"), session_stats.spam);
+			gtk_text_buffer_insert_with_tags_by_name(stats_text_buffer, &iter, buf, -1,
+								 "indented-list-item", NULL);
+		}
 
 		gtk_text_buffer_insert(stats_text_buffer, &iter, "\n", 1);
 		gtk_text_buffer_insert_with_tags_by_name(stats_text_buffer, &iter,
diff --git a/src/main.h b/src/main.h
index b1fb2fd70..901430b3d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * 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
@@ -32,6 +32,7 @@ typedef struct _SessionStats SessionStats;
 struct _SessionStats
 {
 	gint received;
+	gint spam;
 	gint sent;
 	gint replied;
 	gint forwarded;
diff --git a/src/plugins/bogofilter/bogofilter.c b/src/plugins/bogofilter/bogofilter.c
index 678d2d6c4..aeaaebe7d 100644
--- a/src/plugins/bogofilter/bogofilter.c
+++ b/src/plugins/bogofilter/bogofilter.c
@@ -1,6 +1,6 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2021 the Claws Mail team and Colin Leroy
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2023 the Claws Mail team and Colin Leroy
  *
  * 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
@@ -45,6 +45,7 @@
 #include "prefs_gtk.h"
 
 #include "bogofilter.h"
+#include "main.h"
 #include "inc.h"
 #include "log.h"
 #include "prefs_common.h"
@@ -84,6 +85,8 @@ static MessageCallback message_callback;
 
 static BogofilterConfig config;
 
+extern SessionStats session_stats;
+
 static PrefParam param[] = {
 	{"process_emails", "TRUE", &config.process_emails, P_BOOL,
 	 NULL, NULL, NULL},
@@ -303,7 +306,7 @@ static void bogofilter_do_filter(BogoFilterData *data)
 								data->mail_filtering_data->filtered, msginfo);
 						}
 						data->new_spams = g_slist_prepend(data->new_spams, msginfo);
-
+						session_stats.spam++;
 					} else if (whitelisted && parts && parts[0] && parts[1] && 
 							(*parts[1] == 'S' || *parts[1] == 'U')) {
 
diff --git a/src/plugins/bsfilter/bsfilter.c b/src/plugins/bsfilter/bsfilter.c
index c52e89e0c..86f25444a 100644
--- a/src/plugins/bsfilter/bsfilter.c
+++ b/src/plugins/bsfilter/bsfilter.c
@@ -1,6 +1,6 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2021 the Claws Mail team and
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2023 the Claws Mail team and
  * Colin Leroy <colin at colino.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -48,6 +48,7 @@
 #include "utils.h"
 
 #include "bsfilter.h"
+#include "main.h"
 #include "inc.h"
 #include "log.h"
 #include "prefs_common.h"
@@ -83,6 +84,8 @@ static MessageCallback message_callback;
 
 static BsfilterConfig config;
 
+extern SessionStats session_stats;
+
 static PrefParam param[] = {
 	{"process_emails", "TRUE", &config.process_emails, P_BOOL,
 	 NULL, NULL, NULL},
@@ -340,6 +343,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
 	} else {
 		if (!whitelisted || (whitelisted && !config.learn_from_whitelist)) {
 			procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);
+			session_stats.spam++;
 			debug_print("flagging spam: %d\n", msginfo->msgnum);
 			filtered = TRUE;
 		}
diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index dedbe96e4..00a81ab34 100644
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -1,6 +1,6 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2021 the Claws Mail Team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2023 the Claws Mail Team
  *
  * 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
@@ -46,6 +46,7 @@
 
 #include "libspamc.h"
 #include "spamassassin.h"
+#include "main.h"
 #include "inc.h"
 #include "log.h"
 #include "prefs_common.h"
@@ -88,6 +89,8 @@ static MessageCallback message_callback;
 
 static SpamAssassinConfig config;
 
+extern SessionStats session_stats;
+
 static PrefParam param[] = {
 	{"enable", "FALSE", &config.enable, P_BOOL,
 	NULL, NULL, NULL},
@@ -297,6 +300,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
 	if (is_spam) {
 		debug_print("message is spam\n");
 		procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);
+		session_stats.spam++;
 		if (config.receive_spam) {
 			FolderItem *save_folder = NULL;
 

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Wed Feb  8 13:12:54 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Wed,  8 Feb 2023 13:12:54 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, master, updated. 4.1.1-38-gfbc0627c8
Message-ID: <20230208131255.0EF1440039@claws-mail.org>

The branch, master has been updated
       via  fbc0627c83e9baeb82f4427f32d8be29cad41c2c (commit)
      from  681b0766cfd81b748d09b8239726ade553e7deea (commit)

Summary of changes:
 AUTHORS           |  3 ++-
 src/gtk/authors.h |  1 +
 src/mimeview.c    |  4 ++--
 src/procheader.c  |  6 +++---
 src/procheader.h  |  4 ++--
 src/textview.c    | 10 ++++++----
 6 files changed, 16 insertions(+), 12 deletions(-)


- Log -----------------------------------------------------------------
commit fbc0627c83e9baeb82f4427f32d8be29cad41c2c
Author: Paul <paul at claws-mail.org>
Date:   Wed Feb 8 13:12:50 2023 +0000

    fix bug 4658, 'Headers unfolded incorrectly in message view'
    
    based on patch by Viatrix

diff --git a/AUTHORS b/AUTHORS
index 084b05c70..2eb6b0d77 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -342,4 +342,5 @@ contributors (in addition to the above; based on Changelog)
 	Ramin Yaghoubzadeh Torky
 	Manuel Stoeckl
 	Frank Mueller
-    JP Guillonneau
+	JP Guillonneau
+	Viatrix
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index a84aa7485..c1c3044bf 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -317,6 +317,7 @@ static char *CONTRIBS_LIST[] = {
 "Aleksandar Uro?evi?",
 "Petr Vanek",
 "Jeroen Versteeg",
+"Viatrix",
 "Kevin Vigor",
 "Michael Vilain",
 "Johan Vromans",
diff --git a/src/mimeview.c b/src/mimeview.c
index e782dce76..ef12ed8f5 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2022 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
@@ -1669,7 +1669,7 @@ static void mimeview_drag_data_get(GtkWidget	    *widget,
 
 		fp = claws_fopen(partinfo->data.filename, "rb");
 		if (fp != NULL && fseek(fp, partinfo->offset, SEEK_SET) == 0) {
-			headers = procheader_get_header_array_asis(fp);
+			headers = procheader_get_header_array(fp);
 			if (headers) {
 				gint i;
 				for (i = 0; i < headers->len; i++) {
diff --git a/src/procheader.c b/src/procheader.c
index 106deadec..220a808a9 100644
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2014 Hiroyuki Yamamoto and the Claws Mail team
+ * 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
@@ -265,7 +265,7 @@ gint procheader_get_one_field_asis(gchar **buf, FILE *fp)
 				     FALSE);
 }
 
-GPtrArray *procheader_get_header_array_asis(FILE *fp)
+GPtrArray *procheader_get_header_array(FILE *fp)
 {
 	gchar *buf = NULL;
 	GPtrArray *headers;
@@ -275,7 +275,7 @@ GPtrArray *procheader_get_header_array_asis(FILE *fp)
 
 	headers = g_ptr_array_new();
 
-	while (procheader_get_one_field_asis(&buf, fp) != -1) {
+	while (procheader_get_one_field(&buf, fp, NULL) != -1) {
 		if ((header = procheader_parse_header(buf)) != NULL)
 			g_ptr_array_add(headers, header);
 		g_free(buf);
diff --git a/src/procheader.h b/src/procheader.h
index 3e5681946..a5c3201d0 100644
--- a/src/procheader.h
+++ b/src/procheader.h
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2014 Hiroyuki Yamamoto and the Claws Mail team
+ * 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
@@ -47,7 +47,7 @@ gint procheader_get_one_field		(gchar		**buf,
 gint procheader_get_one_field_asis	(gchar		**buf,
 					 FILE		*fp);
 
-GPtrArray *procheader_get_header_array_asis	(FILE		*fp);
+GPtrArray *procheader_get_header_array		(FILE		*fp);
 void procheader_header_array_destroy		(GPtrArray	*harray);
 void procheader_header_free			(Header		*header);
 
diff --git a/src/textview.c b/src/textview.c
index b986de84e..3e425e25b 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2022 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
@@ -1926,10 +1926,11 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 	cm_return_val_if_fail(fp != NULL, NULL);
 
 	if (prefs_common.show_all_headers) {
-		headers = procheader_get_header_array_asis(fp);
+		headers = procheader_get_header_array(fp);
 		sorted_headers = g_ptr_array_new();
 		for (i = 0; i < headers->len; i++) {
 			header = g_ptr_array_index(headers, i);
+			unfold_line(header->body);
 			if (!procheader_header_is_internal(header->name))
 				g_ptr_array_add(sorted_headers, header);
 			else
@@ -1945,7 +1946,7 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 		return NULL;
 	}
 
-	headers = procheader_get_header_array_asis(fp);
+	headers = procheader_get_header_array(fp);
 
 	sorted_headers = g_ptr_array_new();
 
@@ -1956,7 +1957,7 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 
 		for (i = 0; i < headers->len; i++) {
 			header = g_ptr_array_index(headers, i);
-
+			unfold_line(header->body);
 			if (procheader_headername_equal(header->name,
 							dp->name)) {
 				if (dp->hidden)
@@ -1973,6 +1974,7 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 	if (prefs_common.show_other_header) {
 		for (i = 0; i < headers->len; i++) {
 			header = g_ptr_array_index(headers, i);
+			unfold_line(header->body);
 			if (!procheader_header_is_internal(header->name)) {
 				g_ptr_array_add(sorted_headers, header);
 			} else {

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Wed Feb  8 13:17:59 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Wed,  8 Feb 2023 13:17:59 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, gtk2, updated. 3.19.1-32-gd37bf5669
Message-ID: <20230208131759.432F840087@claws-mail.org>

The branch, gtk2 has been updated
       via  d37bf5669f3cbfdbdacb1f637d7e8b4c8ba29aa1 (commit)
      from  a50dcf4781345bfb24769af86b842d33b051870b (commit)

Summary of changes:
 AUTHORS           |  3 ++-
 src/gtk/authors.h |  1 +
 src/mimeview.c    |  4 ++--
 src/procheader.c  |  8 ++++----
 src/procheader.h  |  6 +++---
 src/textview.c    | 12 +++++++-----
 6 files changed, 19 insertions(+), 15 deletions(-)


- Log -----------------------------------------------------------------
commit d37bf5669f3cbfdbdacb1f637d7e8b4c8ba29aa1
Author: Paul <paul at claws-mail.org>
Date:   Wed Feb 8 13:12:50 2023 +0000

    fix bug 4658, 'Headers unfolded incorrectly in message view'
    
    based on patch by Viatrix

diff --git a/AUTHORS b/AUTHORS
index 084b05c70..2eb6b0d77 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -342,4 +342,5 @@ contributors (in addition to the above; based on Changelog)
 	Ramin Yaghoubzadeh Torky
 	Manuel Stoeckl
 	Frank Mueller
-    JP Guillonneau
+	JP Guillonneau
+	Viatrix
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 1b2f322e6..59aef83fb 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -316,6 +316,7 @@ static char *CONTRIBS_LIST[] = {
 "Aleksandar Uro?evi?",
 "Petr Vanek",
 "Jeroen Versteeg",
+"Viatrix",
 "Kevin Vigor",
 "Michael Vilain",
 "Johan Vromans",
diff --git a/src/mimeview.c b/src/mimeview.c
index e2baa574c..1b5d8e11c 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2022 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
@@ -1645,7 +1645,7 @@ static void mimeview_drag_data_get(GtkWidget	    *widget,
 
 		fp = claws_fopen(partinfo->data.filename, "rb");
 		if (fp != NULL && fseek(fp, partinfo->offset, SEEK_SET) == 0) {
-			headers = procheader_get_header_array_asis(fp);
+			headers = procheader_get_header_array(fp);
 			if (headers) {
 				gint i;
 				for (i = 0; i < headers->len; i++) {
diff --git a/src/procheader.c b/src/procheader.c
index fa09943b6..220a808a9 100644
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2014 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * 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
@@ -265,7 +265,7 @@ gint procheader_get_one_field_asis(gchar **buf, FILE *fp)
 				     FALSE);
 }
 
-GPtrArray *procheader_get_header_array_asis(FILE *fp)
+GPtrArray *procheader_get_header_array(FILE *fp)
 {
 	gchar *buf = NULL;
 	GPtrArray *headers;
@@ -275,7 +275,7 @@ GPtrArray *procheader_get_header_array_asis(FILE *fp)
 
 	headers = g_ptr_array_new();
 
-	while (procheader_get_one_field_asis(&buf, fp) != -1) {
+	while (procheader_get_one_field(&buf, fp, NULL) != -1) {
 		if ((header = procheader_parse_header(buf)) != NULL)
 			g_ptr_array_add(headers, header);
 		g_free(buf);
diff --git a/src/procheader.h b/src/procheader.h
index 50e6c556b..a5c3201d0 100644
--- a/src/procheader.h
+++ b/src/procheader.h
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2014 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * 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
@@ -47,7 +47,7 @@ gint procheader_get_one_field		(gchar		**buf,
 gint procheader_get_one_field_asis	(gchar		**buf,
 					 FILE		*fp);
 
-GPtrArray *procheader_get_header_array_asis	(FILE		*fp);
+GPtrArray *procheader_get_header_array		(FILE		*fp);
 void procheader_header_array_destroy		(GPtrArray	*harray);
 void procheader_header_free			(Header		*header);
 
diff --git a/src/textview.c b/src/textview.c
index 9d2babf8a..4c751c9fc 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1,6 +1,6 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * 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
@@ -1947,10 +1947,11 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 	cm_return_val_if_fail(fp != NULL, NULL);
 
 	if (prefs_common.show_all_headers) {
-		headers = procheader_get_header_array_asis(fp);
+		headers = procheader_get_header_array(fp);
 		sorted_headers = g_ptr_array_new();
 		for (i = 0; i < headers->len; i++) {
 			header = g_ptr_array_index(headers, i);
+			unfold_line(header->body);
 			if (!procheader_header_is_internal(header->name))
 				g_ptr_array_add(sorted_headers, header);
 			else
@@ -1966,7 +1967,7 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 		return NULL;
 	}
 
-	headers = procheader_get_header_array_asis(fp);
+	headers = procheader_get_header_array(fp);
 
 	sorted_headers = g_ptr_array_new();
 
@@ -1977,7 +1978,7 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 
 		for (i = 0; i < headers->len; i++) {
 			header = g_ptr_array_index(headers, i);
-
+			unfold_line(header->body);
 			if (procheader_headername_equal(header->name,
 							dp->name)) {
 				if (dp->hidden)
@@ -1994,6 +1995,7 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 	if (prefs_common.show_other_header) {
 		for (i = 0; i < headers->len; i++) {
 			header = g_ptr_array_index(headers, i);
+			unfold_line(header->body);
 			if (!procheader_header_is_internal(header->name)) {
 				g_ptr_array_add(sorted_headers, header);
 			} else {

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Wed Feb  8 13:36:15 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Wed,  8 Feb 2023 13:36:15 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, master, updated. 4.1.1-39-g8d176a20c
Message-ID: <20230208133615.8F4AA403CD@claws-mail.org>

The branch, master has been updated
       via  8d176a20c6424d9c5c97e6866ef80795dab0909a (commit)
      from  fbc0627c83e9baeb82f4427f32d8be29cad41c2c (commit)

Summary of changes:
 src/textview.c | 2 --
 1 file changed, 2 deletions(-)


- Log -----------------------------------------------------------------
commit 8d176a20c6424d9c5c97e6866ef80795dab0909a
Author: Paul <paul at claws-mail.org>
Date:   Wed Feb 8 13:36:11 2023 +0000

    remove two unnecessary lines added in last commit

diff --git a/src/textview.c b/src/textview.c
index 3e425e25b..0e7b3ae18 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1930,7 +1930,6 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 		sorted_headers = g_ptr_array_new();
 		for (i = 0; i < headers->len; i++) {
 			header = g_ptr_array_index(headers, i);
-			unfold_line(header->body);
 			if (!procheader_header_is_internal(header->name))
 				g_ptr_array_add(sorted_headers, header);
 			else
@@ -1957,7 +1956,6 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 
 		for (i = 0; i < headers->len; i++) {
 			header = g_ptr_array_index(headers, i);
-			unfold_line(header->body);
 			if (procheader_headername_equal(header->name,
 							dp->name)) {
 				if (dp->hidden)

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Wed Feb  8 13:37:07 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Wed,  8 Feb 2023 13:37:07 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, gtk2, updated. 3.19.1-33-g417096981
Message-ID: <20230208133707.E6490402D2@claws-mail.org>

The branch, gtk2 has been updated
       via  41709698187ee7b0c2f9aa116b5b8872903f8293 (commit)
      from  d37bf5669f3cbfdbdacb1f637d7e8b4c8ba29aa1 (commit)

Summary of changes:
 src/textview.c | 2 --
 1 file changed, 2 deletions(-)


- Log -----------------------------------------------------------------
commit 41709698187ee7b0c2f9aa116b5b8872903f8293
Author: Paul <paul at claws-mail.org>
Date:   Wed Feb 8 13:36:11 2023 +0000

    remove two unnecessary lines added in last commit

diff --git a/src/textview.c b/src/textview.c
index 4c751c9fc..d552c3d56 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1951,7 +1951,6 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 		sorted_headers = g_ptr_array_new();
 		for (i = 0; i < headers->len; i++) {
 			header = g_ptr_array_index(headers, i);
-			unfold_line(header->body);
 			if (!procheader_header_is_internal(header->name))
 				g_ptr_array_add(sorted_headers, header);
 			else
@@ -1978,7 +1977,6 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 
 		for (i = 0; i < headers->len; i++) {
 			header = g_ptr_array_index(headers, i);
-			unfold_line(header->body);
 			if (procheader_headername_equal(header->name,
 							dp->name)) {
 				if (dp->hidden)

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Mon Feb 13 06:18:53 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Mon, 13 Feb 2023 06:18:53 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, master, updated. 4.1.1-40-g22480dc3a
Message-ID: <20230213061853.AD25640281@claws-mail.org>

The branch, master has been updated
       via  22480dc3a29c8a9f32a68749b5509b57849263f4 (commit)
      from  8d176a20c6424d9c5c97e6866ef80795dab0909a (commit)

Summary of changes:
 src/main.c | 1 +
 1 file changed, 1 insertion(+)


- Log -----------------------------------------------------------------
commit 22480dc3a29c8a9f32a68749b5509b57849263f4
Author: Paul <paul at claws-mail.org>
Date:   Mon Feb 13 06:18:49 2023 +0000

    (re-)initialize session spam statistics

diff --git a/src/main.c b/src/main.c
index e0205c4b5..bf1a9ac57 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1040,6 +1040,7 @@ static void reset_statistics(void)
 	session_stats.sent = 0;
 	session_stats.replied = 0;
 	session_stats.forwarded = 0;
+	session_stats.spam = 0;
 	session_stats.time_started = time(NULL);
 }
 

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Mon Feb 13 06:19:36 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Mon, 13 Feb 2023 06:19:36 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, gtk2, updated. 3.19.1-34-g482a9a89c
Message-ID: <20230213061936.4E48340181@claws-mail.org>

The branch, gtk2 has been updated
       via  482a9a89cfe798a0212d1295be409bf57c8f572c (commit)
      from  41709698187ee7b0c2f9aa116b5b8872903f8293 (commit)

Summary of changes:
 src/main.c | 1 +
 1 file changed, 1 insertion(+)


- Log -----------------------------------------------------------------
commit 482a9a89cfe798a0212d1295be409bf57c8f572c
Author: Paul <paul at claws-mail.org>
Date:   Mon Feb 13 06:18:49 2023 +0000

    (re-)initialize session spam statistics

diff --git a/src/main.c b/src/main.c
index bf1ed927c..f18060ec3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1039,6 +1039,7 @@ static void reset_statistics(void)
 	session_stats.sent = 0;
 	session_stats.replied = 0;
 	session_stats.forwarded = 0;
+	session_stats.spam = 0;
 	session_stats.time_started = time(NULL);
 }
 

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Mon Feb 13 09:28:16 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Mon, 13 Feb 2023 09:28:16 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, master, updated. 4.1.1-41-g9e1cb8b14
Message-ID: <20230213092816.971AF40377@claws-mail.org>

The branch, master has been updated
       via  9e1cb8b14041fb17e06a9709b82e60b849f9381b (commit)
      from  22480dc3a29c8a9f32a68749b5509b57849263f4 (commit)

Summary of changes:
 src/main.c | 6 ++++++
 1 file changed, 6 insertions(+)


- Log -----------------------------------------------------------------
commit 9e1cb8b14041fb17e06a9709b82e60b849f9381b
Author: Paul <paul at claws-mail.org>
Date:   Mon Feb 13 09:28:12 2023 +0000

    add spam session stats to command line output

diff --git a/src/main.c b/src/main.c
index bf1a9ac57..911fd0dfc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2768,6 +2768,12 @@ static void lock_socket_input_cb(gpointer data,
 				session_stats.received);
  		CM_FD_WRITE_ALL(tmp);
 
+		if (session_stats.spam > 0) {
+			g_snprintf(tmp, sizeof(tmp), _("Spam messages: %d\n"),
+					session_stats.spam);
+			CM_FD_WRITE_ALL(tmp);
+		}
+
  		CM_FD_WRITE_ALL("\n");
 
 		g_snprintf(tmp, sizeof(tmp), _("Outgoing traffic\n"));

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Mon Feb 13 09:29:18 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Mon, 13 Feb 2023 09:29:18 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, gtk2, updated. 3.19.1-35-g867de67c5
Message-ID: <20230213092918.70C5740377@claws-mail.org>

The branch, gtk2 has been updated
       via  867de67c53fc50d648e2c40548539a8c8b4181e4 (commit)
      from  482a9a89cfe798a0212d1295be409bf57c8f572c (commit)

Summary of changes:
 src/main.c | 6 ++++++
 1 file changed, 6 insertions(+)


- Log -----------------------------------------------------------------
commit 867de67c53fc50d648e2c40548539a8c8b4181e4
Author: Paul <paul at claws-mail.org>
Date:   Mon Feb 13 09:28:12 2023 +0000

    add spam session stats to command line output

diff --git a/src/main.c b/src/main.c
index f18060ec3..dd41dfc99 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2771,6 +2771,12 @@ static void lock_socket_input_cb(gpointer data,
 				session_stats.received);
  		CM_FD_WRITE_ALL(tmp);
 
+		if (session_stats.spam > 0) {
+			g_snprintf(tmp, sizeof(tmp), _("Spam messages: %d\n"),
+					session_stats.spam);
+			CM_FD_WRITE_ALL(tmp);
+		}
+
  		CM_FD_WRITE_ALL("\n");
 
 		g_snprintf(tmp, sizeof(tmp), _("Outgoing traffic\n"));

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Tue Feb 21 16:44:42 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Tue, 21 Feb 2023 16:44:42 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, master, updated. 4.1.1-43-g48086e4e8
Message-ID: <20230221164442.A6DEA4044B@claws-mail.org>

The branch, master has been updated
       via  48086e4e82e033b2403af63b9ffb9ca2dd7b696f (commit)
       via  c61593c30a4b7c2f5a170bde54c27af2d09a0868 (commit)
      from  9e1cb8b14041fb17e06a9709b82e60b849f9381b (commit)

Summary of changes:
 AUTHORS           |  1 +
 src/gtk/authors.h |  1 +
 src/oauth2.c      | 70 ++++++++++++++++++++++++++++---------------------------
 3 files changed, 38 insertions(+), 34 deletions(-)


- Log -----------------------------------------------------------------
commit 48086e4e82e033b2403af63b9ffb9ca2dd7b696f
Author: Paul <paul at claws-mail.org>
Date:   Tue Feb 21 16:44:38 2023 +0000

    fix bug 4664, 'OAUTH2 overwrites passwords even for plaintext logins'
    
    based on patch by Roland Haas

diff --git a/AUTHORS b/AUTHORS
index 2eb6b0d77..b822e4772 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -344,3 +344,4 @@ contributors (in addition to the above; based on Changelog)
 	Frank Mueller
 	JP Guillonneau
 	Viatrix
+	Roland Haas
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index c1c3044bf..609a0cd7c 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -164,6 +164,7 @@ static char *CONTRIBS_LIST[] = {
 "Mitko Haralanov",
 "Alexander Lyons Harkness",
 "Hashimoto",
+"Roland Haas",
 "Jacob Head",
 "Federico Heinz",
 "Geir Helland",
diff --git a/src/oauth2.c b/src/oauth2.c
index e80bf88cd..f9bd47802 100644
--- a/src/oauth2.c
+++ b/src/oauth2.c
@@ -35,6 +35,7 @@
 #include <string.h>
 #include <errno.h>
 
+#include "imap.h"
 #include "oauth2.h"
 #include "md5.h"
 #include "utils.h"
@@ -653,7 +654,9 @@ gint oauth2_check_passwds (PrefsAccount *ac_prefs)
 	if (ret)
 		log_message(LOG_PROTOCOL, _("OAuth2 access token not obtained\n"));
 	else {
-		passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_RECV, OAUTH2Data->access_token, FALSE);
+		if (ac_prefs->imap_auth_type == IMAP_AUTH_OAUTH2 ||
+		    (ac_prefs->use_pop_auth && ac_prefs->pop_auth_type == POPAUTH_OAUTH2))
+			passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_RECV, OAUTH2Data->access_token, FALSE);
 		if (ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2)
 			passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_SEND, OAUTH2Data->access_token, FALSE);
 		passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, OAUTH2Data->expiry_str, FALSE);

commit c61593c30a4b7c2f5a170bde54c27af2d09a0868
Author: Paul <paul at claws-mail.org>
Date:   Tue Feb 21 16:41:18 2023 +0000

    code style

diff --git a/src/oauth2.c b/src/oauth2.c
index c3065d82c..e80bf88cd 100644
--- a/src/oauth2.c
+++ b/src/oauth2.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2021-2022 the Claws Mail team
+ * Copyright (C) 2021-2023 the Claws Mail team
  *
  * 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
@@ -626,45 +626,44 @@ gint oauth2_check_passwds (PrefsAccount *ac_prefs)
 	OAUTH2Data->custom_client_id = ac_prefs->oauth2_client_id;
 	OAUTH2Data->custom_client_secret = ac_prefs->oauth2_client_secret;
 	
-	if(passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_EXPIRY)) {
-	  acc = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_EXPIRY);
-	  expiry = atoi(acc);
-	  g_free(acc);
-	  if (expiry >  (g_get_real_time () / G_USEC_PER_SEC)){
-	    g_free(OAUTH2Data);
-	    log_message(LOG_PROTOCOL, _("OAuth2 access token still fresh\n"));
-	    g_free(uid);
-	    return (0);
-	  }
+	if (passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_EXPIRY)) {
+		acc = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_EXPIRY);
+		expiry = atoi(acc);
+		g_free(acc);
+		if (expiry >  (g_get_real_time () / G_USEC_PER_SEC)) {
+			g_free(OAUTH2Data);
+			log_message(LOG_PROTOCOL, _("OAuth2 access token still fresh\n"));
+			g_free(uid);
+			return (0);
+		}
 	}
 	
-	if(passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_REFRESH)) {
-	  log_message(LOG_PROTOCOL, _("OAuth2 obtaining access token using refresh token\n"));
-	  OAUTH2Data->refresh_token = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_REFRESH);
-	  ret = oauth2_use_refresh_token (ac_prefs->oauth2_provider, OAUTH2Data);
-	}else if (passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_AUTH)) {
-	  log_message(LOG_PROTOCOL, _("OAuth2 trying for fresh access token with authorization code\n"));
-	  acc = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_AUTH);
-	  ret = oauth2_obtain_tokens (ac_prefs->oauth2_provider, OAUTH2Data, acc);
-	  g_free(acc);
-	}else{
-	  ret = 1;
-	}
+	if (passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_REFRESH)) {
+		log_message(LOG_PROTOCOL, _("OAuth2 obtaining access token using refresh token\n"));
+		OAUTH2Data->refresh_token = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_REFRESH);
+		ret = oauth2_use_refresh_token (ac_prefs->oauth2_provider, OAUTH2Data);
+	} else if (passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_AUTH)) {
+		log_message(LOG_PROTOCOL, _("OAuth2 trying for fresh access token with authorization code\n"));
+		acc = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_AUTH);
+		ret = oauth2_obtain_tokens (ac_prefs->oauth2_provider, OAUTH2Data, acc);
+		g_free(acc);
+	} else
+		ret = 1;
 	
-	if (ret){
-	  log_message(LOG_PROTOCOL, _("OAuth2 access token not obtained\n"));
-	}else{
-	  passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_RECV, OAUTH2Data->access_token, FALSE);
-      if (ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2)
-	        passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_SEND, OAUTH2Data->access_token, FALSE);
-	  passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, OAUTH2Data->expiry_str, FALSE);
-	  //Some providers issue replacement refresh tokens with each access token. Re-store whether replaced or not. 
-	  passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_REFRESH, OAUTH2Data->refresh_token, FALSE);
-	  log_message(LOG_PROTOCOL, _("OAuth2 access and refresh token updated\n"));  
+	if (ret)
+		log_message(LOG_PROTOCOL, _("OAuth2 access token not obtained\n"));
+	else {
+		passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_RECV, OAUTH2Data->access_token, FALSE);
+		if (ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2)
+			passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_SEND, OAUTH2Data->access_token, FALSE);
+		passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, OAUTH2Data->expiry_str, FALSE);
+		//Some providers issue replacement refresh tokens with each access token. Re-store whether replaced or not. 
+		passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_REFRESH, OAUTH2Data->refresh_token, FALSE);
+		log_message(LOG_PROTOCOL, _("OAuth2 access and refresh token updated\n"));  
 	}
 
 	g_free(OAUTH2Data);
-    g_free(uid);
+	g_free(uid);
 	
 	return (ret);
 }

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Tue Feb 21 16:54:33 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Tue, 21 Feb 2023 16:54:33 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, gtk2, updated. 3.19.1-37-g9c6fc6254
Message-ID: <20230221165433.B8C61409A1@claws-mail.org>

The branch, gtk2 has been updated
       via  9c6fc6254f4ac316e6416fa49a79be9a40ec0882 (commit)
       via  aea82d448e3dbdb3516db600d0570815aaaa50dd (commit)
      from  867de67c53fc50d648e2c40548539a8c8b4181e4 (commit)

Summary of changes:
 AUTHORS           |  1 +
 src/gtk/authors.h |  1 +
 src/oauth2.c      | 72 ++++++++++++++++++++++++++++---------------------------
 3 files changed, 39 insertions(+), 35 deletions(-)


- Log -----------------------------------------------------------------
commit 9c6fc6254f4ac316e6416fa49a79be9a40ec0882
Author: Paul <paul at claws-mail.org>
Date:   Tue Feb 21 16:44:38 2023 +0000

    fix bug 4664, 'OAUTH2 overwrites passwords even for plaintext logins'
    
    based on patch by Roland Haas

diff --git a/AUTHORS b/AUTHORS
index 2eb6b0d77..b822e4772 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -344,3 +344,4 @@ contributors (in addition to the above; based on Changelog)
 	Frank Mueller
 	JP Guillonneau
 	Viatrix
+	Roland Haas
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 59aef83fb..87000fa66 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -163,6 +163,7 @@ static char *CONTRIBS_LIST[] = {
 "Mitko Haralanov",
 "Alexander Lyons Harkness",
 "Hashimoto",
+"Roland Haas",
 "Jacob Head",
 "Federico Heinz",
 "Geir Helland",
diff --git a/src/oauth2.c b/src/oauth2.c
index 272bda3ff..f9e6ee106 100644
--- a/src/oauth2.c
+++ b/src/oauth2.c
@@ -35,6 +35,7 @@
 #include <string.h>
 #include <errno.h>
 
+#include "imap.h"
 #include "oauth2.h"
 #include "md5.h"
 #include "utils.h"
@@ -652,7 +653,9 @@ gint oauth2_check_passwds (PrefsAccount *ac_prefs)
 	if (ret)
 		log_message(LOG_PROTOCOL, _("OAuth2 access token not obtained\n"));
 	else {
-		passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_RECV, OAUTH2Data->access_token, FALSE);
+		if (ac_prefs->imap_auth_type == IMAP_AUTH_OAUTH2 ||
+		    (ac_prefs->use_pop_auth && ac_prefs->pop_auth_type == POPAUTH_OAUTH2))
+			passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_RECV, OAUTH2Data->access_token, FALSE);
 		if (ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2)
 			passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_SEND, OAUTH2Data->access_token, FALSE);
 		passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, OAUTH2Data->expiry_str, FALSE);

commit aea82d448e3dbdb3516db600d0570815aaaa50dd
Author: Paul <paul at claws-mail.org>
Date:   Tue Feb 21 16:41:18 2023 +0000

    code style

diff --git a/src/oauth2.c b/src/oauth2.c
index d65d06ea3..272bda3ff 100644
--- a/src/oauth2.c
+++ b/src/oauth2.c
@@ -1,6 +1,6 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2021-2022 the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2021-2023 the Claws Mail team
  *
  * 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
@@ -625,45 +625,44 @@ gint oauth2_check_passwds (PrefsAccount *ac_prefs)
 	OAUTH2Data->custom_client_id = ac_prefs->oauth2_client_id;
 	OAUTH2Data->custom_client_secret = ac_prefs->oauth2_client_secret;
 	
-	if(passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_EXPIRY)) {
-	  acc = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_EXPIRY);
-	  expiry = atoi(acc);
-	  g_free(acc);
-	  if (expiry >  (g_get_real_time () / G_USEC_PER_SEC)){
-	    g_free(OAUTH2Data);
-	    log_message(LOG_PROTOCOL, _("OAuth2 access token still fresh\n"));
-	    g_free(uid);
-	    return (0);
-	  }
+	if (passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_EXPIRY)) {
+		acc = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_EXPIRY);
+		expiry = atoi(acc);
+		g_free(acc);
+		if (expiry >  (g_get_real_time () / G_USEC_PER_SEC)) {
+			g_free(OAUTH2Data);
+			log_message(LOG_PROTOCOL, _("OAuth2 access token still fresh\n"));
+			g_free(uid);
+			return (0);
+		}
 	}
 	
-	if(passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_REFRESH)) {
-	  log_message(LOG_PROTOCOL, _("OAuth2 obtaining access token using refresh token\n"));
-	  OAUTH2Data->refresh_token = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_REFRESH);
-	  ret = oauth2_use_refresh_token (ac_prefs->oauth2_provider, OAUTH2Data);
-	}else if (passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_AUTH)) {
-	  log_message(LOG_PROTOCOL, _("OAuth2 trying for fresh access token with authorization code\n"));
-	  acc = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_AUTH);
-	  ret = oauth2_obtain_tokens (ac_prefs->oauth2_provider, OAUTH2Data, acc);
-	  g_free(acc);
-	}else{
-	  ret = 1;
-	}
+	if (passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_REFRESH)) {
+		log_message(LOG_PROTOCOL, _("OAuth2 obtaining access token using refresh token\n"));
+		OAUTH2Data->refresh_token = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_REFRESH);
+		ret = oauth2_use_refresh_token (ac_prefs->oauth2_provider, OAUTH2Data);
+	} else if (passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_AUTH)) {
+		log_message(LOG_PROTOCOL, _("OAuth2 trying for fresh access token with authorization code\n"));
+		acc = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_AUTH);
+		ret = oauth2_obtain_tokens (ac_prefs->oauth2_provider, OAUTH2Data, acc);
+		g_free(acc);
+	} else
+		ret = 1;
 	
-	if (ret){
-	  log_message(LOG_PROTOCOL, _("OAuth2 access token not obtained\n"));
-	}else{
-	  passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_RECV, OAUTH2Data->access_token, FALSE);
-      if (ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2)
-	        passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_SEND, OAUTH2Data->access_token, FALSE);
-	  passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, OAUTH2Data->expiry_str, FALSE);
-	  //Some providers issue replacement refresh tokens with each access token. Re-store whether replaced or not. 
-	  passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_REFRESH, OAUTH2Data->refresh_token, FALSE);
-	  log_message(LOG_PROTOCOL, _("OAuth2 access and refresh token updated\n"));  
+	if (ret)
+		log_message(LOG_PROTOCOL, _("OAuth2 access token not obtained\n"));
+	else {
+		passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_RECV, OAUTH2Data->access_token, FALSE);
+		if (ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2)
+			passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_SEND, OAUTH2Data->access_token, FALSE);
+		passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, OAUTH2Data->expiry_str, FALSE);
+		//Some providers issue replacement refresh tokens with each access token. Re-store whether replaced or not. 
+		passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_REFRESH, OAUTH2Data->refresh_token, FALSE);
+		log_message(LOG_PROTOCOL, _("OAuth2 access and refresh token updated\n"));  
 	}
 
 	g_free(OAUTH2Data);
-    g_free(uid);
+	g_free(uid);
 	
 	return (ret);
 }

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Tue Feb 21 16:57:25 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Tue, 21 Feb 2023 16:57:25 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, master, updated. 4.1.1-44-g914102789
Message-ID: <20230221165725.2E499409A1@claws-mail.org>

The branch, master has been updated
       via  914102789bbf9b6f333bc94d7041ff836ccb9585 (commit)
      from  48086e4e82e033b2403af63b9ffb9ca2dd7b696f (commit)

Summary of changes:
 src/gtk/authors.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 914102789bbf9b6f333bc94d7041ff836ccb9585
Author: Paul <paul at claws-mail.org>
Date:   Tue Feb 21 16:57:21 2023 +0000

    fix alphabetical order

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 609a0cd7c..537dab46f 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -158,13 +158,12 @@ static char *CONTRIBS_LIST[] = {
 "Yang Guilong",
 "Ashish Gupta",
 "Daniel Gustafson",
-"HIROSHIMA",
+"Roland Haas",
 "Oliver Haertel",
 "Anders Hammar",
 "Mitko Haralanov",
 "Alexander Lyons Harkness",
 "Hashimoto",
-"Roland Haas",
 "Jacob Head",
 "Federico Heinz",
 "Geir Helland",
@@ -173,6 +172,7 @@ static char *CONTRIBS_LIST[] = {
 "Christian Hesse",
 "Higuchi",
 "Hiramatu",
+"HIROSHIMA",
 "Marc Hoper",
 "Michihide Hotta",
 "Shawn Houston",

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Tue Feb 21 16:58:11 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Tue, 21 Feb 2023 16:58:11 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, gtk2, updated. 3.19.1-38-g99fbe6dd4
Message-ID: <20230221165811.6568B409A1@claws-mail.org>

The branch, gtk2 has been updated
       via  99fbe6dd49cdf9caee21b27de465f54745f9b263 (commit)
      from  9c6fc6254f4ac316e6416fa49a79be9a40ec0882 (commit)

Summary of changes:
 src/gtk/authors.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 99fbe6dd49cdf9caee21b27de465f54745f9b263
Author: Paul <paul at claws-mail.org>
Date:   Tue Feb 21 16:57:21 2023 +0000

    fix alphabetical order

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 87000fa66..57402cfa4 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -157,13 +157,12 @@ static char *CONTRIBS_LIST[] = {
 "Yang Guilong",
 "Ashish Gupta",
 "Daniel Gustafson",
-"HIROSHIMA",
+"Roland Haas",
 "Oliver Haertel",
 "Anders Hammar",
 "Mitko Haralanov",
 "Alexander Lyons Harkness",
 "Hashimoto",
-"Roland Haas",
 "Jacob Head",
 "Federico Heinz",
 "Geir Helland",
@@ -172,6 +171,7 @@ static char *CONTRIBS_LIST[] = {
 "Christian Hesse",
 "Higuchi",
 "Hiramatu",
+"HIROSHIMA",
 "Marc Hoper",
 "Michihide Hotta",
 "Shawn Houston",

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Fri Feb 24 09:25:34 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Fri, 24 Feb 2023 09:25:34 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, master, updated. 4.1.1-45-g568c901bc
Message-ID: <20230224092534.7300C40421@claws-mail.org>

The branch, master has been updated
       via  568c901bca98f54d98de89d7bd8f3acdc2cc20af (commit)
      from  914102789bbf9b6f333bc94d7041ff836ccb9585 (commit)

Summary of changes:
 configure.ac | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 568c901bca98f54d98de89d7bd8f3acdc2cc20af
Author: Paul <paul at claws-mail.org>
Date:   Fri Feb 24 09:25:29 2023 +0000

    fix bug 4666, 'fancy plugin doesn't build with libwebkit2gtk-4.1'

diff --git a/configure.ac b/configure.ac
index fdb7db51c..03a87b4d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1274,12 +1274,18 @@ AC_SUBST(EXPAT_CFLAGS)
 AC_SUBST(EXPAT_LIBS)
 
 dnl webkit *********************************************************************
-PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.0 >= 2.18.0, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
+PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.1, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
+if test x"$HAVE_WEBKIT" = xno; then
+	PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.0 >= 2.18.0, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
+fi
 AC_SUBST(WEBKIT_LIBS)
 AC_SUBST(WEBKIT_CFLAGS)
 
 dnl libsoup ********************************************************************
-PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
+PKG_CHECK_MODULES(LIBSOUP, libsoup-3.0, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
+if test x"$HAVE_LIBSOUP" = xno; then
+	PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
+fi
 if test x"$HAVE_LIBSOUP" = xyes; then
 	AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup is available])
 fi
@@ -1621,7 +1627,7 @@ if test x"$enable_fancy_plugin" != xno; then
 	dependencies_missing=""
 
 	if test x"$HAVE_WEBKIT" = xno; then
-		dependencies_missing="libwebkit2gtk-4.0 $dependencies_missing"
+		dependencies_missing="libwebkit2gtk-4.0 or greater $dependencies_missing"
 	fi
 	if test x"$HAVE_CURL" = xno; then
 		dependencies_missing="libcurl $dependencies_missing"

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Fri Feb 24 11:25:01 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Fri, 24 Feb 2023 11:25:01 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, master, updated. 4.1.1-46-gbed3a071a
Message-ID: <20230224112501.BADF540445@claws-mail.org>

The branch, master has been updated
       via  bed3a071ac85a6876e8866d5581b80a17cbe1fe7 (commit)
      from  568c901bca98f54d98de89d7bd8f3acdc2cc20af (commit)

Summary of changes:
 src/plugins/attachwarner/attachwarner.h           |  4 ++--
 src/plugins/attachwarner/attachwarner_prefs.c     |  4 ++--
 src/plugins/attachwarner/attachwarner_prefs.h     |  4 ++--
 src/plugins/keyword_warner/keyword_warner.h       |  4 ++--
 src/plugins/keyword_warner/keyword_warner_prefs.c |  4 ++--
 src/plugins/keyword_warner/keyword_warner_prefs.h |  4 ++--
 src/plugins/rssyl/libfeed/feed.c                  | 21 ++++++++++-----------
 src/plugins/rssyl/libfeed/feed.h                  | 21 ++++++++++-----------
 src/plugins/rssyl/libfeed/feeditem.c              | 21 ++++++++++-----------
 src/plugins/rssyl/libfeed/feeditem.h              | 21 ++++++++++-----------
 src/plugins/rssyl/libfeed/feeditemenclosure.c     | 21 ++++++++++-----------
 src/plugins/rssyl/libfeed/feeditemenclosure.h     | 21 ++++++++++-----------
 src/plugins/rssyl/libfeed/parser.c                | 21 ++++++++++-----------
 src/plugins/rssyl/libfeed/parser.h                | 21 ++++++++++-----------
 src/plugins/rssyl/libfeed/parser_atom10.c         | 21 ++++++++++-----------
 src/plugins/rssyl/libfeed/parser_atom10.h         | 21 ++++++++++-----------
 src/plugins/rssyl/libfeed/parser_rdf.h            | 21 ++++++++++-----------
 src/plugins/rssyl/libfeed/parser_rss20.c          | 21 ++++++++++-----------
 src/plugins/rssyl/libfeed/parser_rss20.h          | 21 ++++++++++-----------
 src/plugins/rssyl/opml_export.c                   |  9 +++------
 src/plugins/rssyl/opml_export.h                   | 18 ++++++++++++++++++
 src/plugins/rssyl/opml_import.c                   | 10 +++-------
 src/plugins/rssyl/opml_import.h                   | 18 ++++++++++++++++++
 src/plugins/rssyl/parse822.c                      |  8 +++-----
 src/plugins/rssyl/parse822.h                      | 18 ++++++++++++++++++
 src/plugins/rssyl/plugin.c                        | 10 +++-------
 src/plugins/rssyl/rssyl.c                         | 10 +++-------
 src/plugins/rssyl/rssyl.h                         | 18 ++++++++++++++++++
 src/plugins/rssyl/rssyl_add_item.c                | 10 +++-------
 src/plugins/rssyl/rssyl_add_item.h                | 18 ++++++++++++++++++
 src/plugins/rssyl/rssyl_cb_menu.c                 | 11 +++--------
 src/plugins/rssyl/rssyl_cb_menu.h                 | 18 ++++++++++++++++++
 src/plugins/rssyl/rssyl_deleted.c                 | 10 +++-------
 src/plugins/rssyl/rssyl_deleted.h                 | 18 ++++++++++++++++++
 src/plugins/rssyl/rssyl_feed.c                    | 21 ++++++++++-----------
 src/plugins/rssyl/rssyl_feed.h                    | 18 ++++++++++++++++++
 src/plugins/rssyl/rssyl_feed_props.c              | 10 +++-------
 src/plugins/rssyl/rssyl_feed_props.h              | 18 ++++++++++++++++++
 src/plugins/rssyl/rssyl_gtk.c                     | 10 +++-------
 src/plugins/rssyl/rssyl_gtk.h                     | 18 ++++++++++++++++++
 src/plugins/rssyl/rssyl_parse_feed.c              | 21 ++++++++++-----------
 src/plugins/rssyl/rssyl_parse_feed.h              | 18 ++++++++++++++++++
 src/plugins/rssyl/rssyl_prefs.c                   | 10 +++-------
 src/plugins/rssyl/rssyl_prefs.h                   | 10 +++-------
 src/plugins/rssyl/rssyl_subscribe.c               | 10 +++-------
 src/plugins/rssyl/rssyl_subscribe.h               | 18 ++++++++++++++++++
 src/plugins/rssyl/rssyl_subscribe_gtk.c           | 10 +++-------
 src/plugins/rssyl/rssyl_subscribe_gtk.h           | 18 ++++++++++++++++++
 src/plugins/rssyl/rssyl_update_comments.c         | 21 ++++++++++-----------
 src/plugins/rssyl/rssyl_update_comments.h         | 18 +++++++++++++++++-
 src/plugins/rssyl/rssyl_update_feed.c             | 21 ++++++++++-----------
 src/plugins/rssyl/rssyl_update_feed.h             | 18 ++++++++++++++++++
 src/plugins/rssyl/rssyl_update_format.c           | 21 ++++++++++-----------
 src/plugins/rssyl/rssyl_update_format.h           | 18 ++++++++++++++++++
 src/plugins/rssyl/strutils.c                      |  9 +++------
 src/plugins/rssyl/strutils.h                      | 18 ++++++++++++++++++
 56 files changed, 542 insertions(+), 313 deletions(-)


- Log -----------------------------------------------------------------
commit bed3a071ac85a6876e8866d5581b80a17cbe1fe7
Author: Paul <paul at claws-mail.org>
Date:   Fri Feb 24 11:24:56 2023 +0000

    update forgotten copyright headers

diff --git a/src/plugins/attachwarner/attachwarner.h b/src/plugins/attachwarner/attachwarner.h
index 4f61126e4..7d44ad872 100644
--- a/src/plugins/attachwarner/attachwarner.h
+++ b/src/plugins/attachwarner/attachwarner.h
@@ -1,10 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2006-2021 Ricardo Mones and the Claws Mail Team
+ * Copyright (C) 2006-2023 the Claws Mail Team and Ricardo Mones
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/src/plugins/attachwarner/attachwarner_prefs.c b/src/plugins/attachwarner/attachwarner_prefs.c
index cbdfb1bfe..48c35be32 100644
--- a/src/plugins/attachwarner/attachwarner_prefs.c
+++ b/src/plugins/attachwarner/attachwarner_prefs.c
@@ -1,10 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2006-2022 Ricardo Mones and the Claws Mail Team
+ * Copyright (C) 2006-2023 the Claws Mail Team and Ricardo Mones
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/src/plugins/attachwarner/attachwarner_prefs.h b/src/plugins/attachwarner/attachwarner_prefs.h
index f4b89f5cc..e59efa841 100644
--- a/src/plugins/attachwarner/attachwarner_prefs.h
+++ b/src/plugins/attachwarner/attachwarner_prefs.h
@@ -1,10 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2006-2021 Ricardo Mones and the Claws Mail Team
+ * Copyright (C) 2006-2023 the Claws Mail Team and Ricardo Mones
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/src/plugins/keyword_warner/keyword_warner.h b/src/plugins/keyword_warner/keyword_warner.h
index c473a73e0..4c73bad44 100644
--- a/src/plugins/keyword_warner/keyword_warner.h
+++ b/src/plugins/keyword_warner/keyword_warner.h
@@ -1,10 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2006-2022 Ricardo Mones and the Claws Mail Team
+ * Copyright (C) 2006-2023 the Claws Mail Team and Ricardo Mones
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/src/plugins/keyword_warner/keyword_warner_prefs.c b/src/plugins/keyword_warner/keyword_warner_prefs.c
index 0f1b5d2ff..012a5159a 100644
--- a/src/plugins/keyword_warner/keyword_warner_prefs.c
+++ b/src/plugins/keyword_warner/keyword_warner_prefs.c
@@ -1,10 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2006-2022 Ricardo Mones and the Claws Mail Team
+ * Copyright (C) 2006-2023 the Claws Mail Team and Ricardo Mones
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/src/plugins/keyword_warner/keyword_warner_prefs.h b/src/plugins/keyword_warner/keyword_warner_prefs.h
index 875b33919..e85d3b385 100644
--- a/src/plugins/keyword_warner/keyword_warner_prefs.h
+++ b/src/plugins/keyword_warner/keyword_warner_prefs.h
@@ -1,10 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2006-2022 Ricardo Mones and the Claws Mail Team
+ * Copyright (C) 2006-2023 the Claws Mail Team and Ricardo Mones
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/src/plugins/rssyl/libfeed/feed.c b/src/plugins/rssyl/libfeed/feed.c
index f467eb645..8c135b6bc 100644
--- a/src/plugins/rssyl/libfeed/feed.c
+++ b/src/plugins/rssyl/libfeed/feed.c
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/plugins/rssyl/libfeed/feed.h b/src/plugins/rssyl/libfeed/feed.h
index c62f462eb..0b4126cb7 100644
--- a/src/plugins/rssyl/libfeed/feed.h
+++ b/src/plugins/rssyl/libfeed/feed.h
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __FEED_H
diff --git a/src/plugins/rssyl/libfeed/feeditem.c b/src/plugins/rssyl/libfeed/feeditem.c
index 8268b8398..cda45feef 100644
--- a/src/plugins/rssyl/libfeed/feeditem.c
+++ b/src/plugins/rssyl/libfeed/feeditem.c
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/plugins/rssyl/libfeed/feeditem.h b/src/plugins/rssyl/libfeed/feeditem.h
index 9125af453..eb307230a 100644
--- a/src/plugins/rssyl/libfeed/feeditem.h
+++ b/src/plugins/rssyl/libfeed/feeditem.h
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __FEEDITEM_H
diff --git a/src/plugins/rssyl/libfeed/feeditemenclosure.c b/src/plugins/rssyl/libfeed/feeditemenclosure.c
index 6e01230af..14a0451fe 100644
--- a/src/plugins/rssyl/libfeed/feeditemenclosure.c
+++ b/src/plugins/rssyl/libfeed/feeditemenclosure.c
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/plugins/rssyl/libfeed/feeditemenclosure.h b/src/plugins/rssyl/libfeed/feeditemenclosure.h
index 69e9eff62..de4147457 100644
--- a/src/plugins/rssyl/libfeed/feeditemenclosure.h
+++ b/src/plugins/rssyl/libfeed/feeditemenclosure.h
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __FEEDITEMENCLOSURE_H
diff --git a/src/plugins/rssyl/libfeed/parser.c b/src/plugins/rssyl/libfeed/parser.c
index e824b8365..6f717e939 100644
--- a/src/plugins/rssyl/libfeed/parser.c
+++ b/src/plugins/rssyl/libfeed/parser.c
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/libfeed/parser.h b/src/plugins/rssyl/libfeed/parser.h
index 02cd0e503..c06382a50 100644
--- a/src/plugins/rssyl/libfeed/parser.h
+++ b/src/plugins/rssyl/libfeed/parser.h
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __PARSER_H
diff --git a/src/plugins/rssyl/libfeed/parser_atom10.c b/src/plugins/rssyl/libfeed/parser_atom10.c
index 71f2068b0..8bb70f5f4 100644
--- a/src/plugins/rssyl/libfeed/parser_atom10.c
+++ b/src/plugins/rssyl/libfeed/parser_atom10.c
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/plugins/rssyl/libfeed/parser_atom10.h b/src/plugins/rssyl/libfeed/parser_atom10.h
index 0b094ab93..c13bd2cea 100644
--- a/src/plugins/rssyl/libfeed/parser_atom10.h
+++ b/src/plugins/rssyl/libfeed/parser_atom10.h
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __PARSER_ATOM10_H
diff --git a/src/plugins/rssyl/libfeed/parser_rdf.h b/src/plugins/rssyl/libfeed/parser_rdf.h
index 66299cbe8..81a727ac9 100644
--- a/src/plugins/rssyl/libfeed/parser_rdf.h
+++ b/src/plugins/rssyl/libfeed/parser_rdf.h
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __PARSER_RDF_H
diff --git a/src/plugins/rssyl/libfeed/parser_rss20.c b/src/plugins/rssyl/libfeed/parser_rss20.c
index 872cf2f5e..8adaff02f 100644
--- a/src/plugins/rssyl/libfeed/parser_rss20.c
+++ b/src/plugins/rssyl/libfeed/parser_rss20.c
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/plugins/rssyl/libfeed/parser_rss20.h b/src/plugins/rssyl/libfeed/parser_rss20.h
index 27cc40c1f..4f985626a 100644
--- a/src/plugins/rssyl/libfeed/parser_rss20.h
+++ b/src/plugins/rssyl/libfeed/parser_rss20.h
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __PARSER_RSS20_H
diff --git a/src/plugins/rssyl/opml_export.c b/src/plugins/rssyl/opml_export.c
index 0ff7d6be9..472e310bd 100644
--- a/src/plugins/rssyl/opml_export.c
+++ b/src/plugins/rssyl/opml_export.c
@@ -1,12 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * This file (C) 2008 Andrej Kacian <andrej at kacian.sk>
- *
- * - Export feed list to OPML
+ * Copyright (C) 2008-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/opml_export.h b/src/plugins/rssyl/opml_export.h
index 6e8914992..2efec5f56 100644
--- a/src/plugins/rssyl/opml_export.h
+++ b/src/plugins/rssyl/opml_export.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2008-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RSSYL_OPML
 #define __RSSYL_OPML
 
diff --git a/src/plugins/rssyl/opml_import.c b/src/plugins/rssyl/opml_import.c
index 855f8b2e1..4edfb2799 100644
--- a/src/plugins/rssyl/opml_import.c
+++ b/src/plugins/rssyl/opml_import.c
@@ -1,13 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
- * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
- *
- * - OPML import handling
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/opml_import.h b/src/plugins/rssyl/opml_import.h
index 91b71aa33..446e77040 100644
--- a/src/plugins/rssyl/opml_import.h
+++ b/src/plugins/rssyl/opml_import.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __OPML_IMPORT
 #define __OPML_IMPORT
 
diff --git a/src/plugins/rssyl/parse822.c b/src/plugins/rssyl/parse822.c
index 72f9398b3..036925508 100644
--- a/src/plugins/rssyl/parse822.c
+++ b/src/plugins/rssyl/parse822.c
@@ -1,11 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
- * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -14,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/parse822.h b/src/plugins/rssyl/parse822.h
index 94318fc73..54ed45295 100644
--- a/src/plugins/rssyl/parse822.h
+++ b/src/plugins/rssyl/parse822.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RSSYL_PARSE822_H
 #define __RSSYL_PARSE822_H
 
diff --git a/src/plugins/rssyl/plugin.c b/src/plugins/rssyl/plugin.c
index 45528afbc..12b9100d7 100644
--- a/src/plugins/rssyl/plugin.c
+++ b/src/plugins/rssyl/plugin.c
@@ -1,13 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
- * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
- *
- * - generic s-c plugin stuff
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl.c b/src/plugins/rssyl/rssyl.c
index 47dd27699..604cee0bd 100644
--- a/src/plugins/rssyl/rssyl.c
+++ b/src/plugins/rssyl/rssyl.c
@@ -1,13 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
- * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
- *
- * - s-c folderclass callback handler functions
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl.h b/src/plugins/rssyl/rssyl.h
index 3ef82a964..2519c0d51 100644
--- a/src/plugins/rssyl/rssyl.h
+++ b/src/plugins/rssyl/rssyl.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RSSYL_H
 #define __RSSYL_H
 
diff --git a/src/plugins/rssyl/rssyl_add_item.c b/src/plugins/rssyl/rssyl_add_item.c
index 1f2c34c09..e54d1bfb2 100644
--- a/src/plugins/rssyl/rssyl_add_item.c
+++ b/src/plugins/rssyl/rssyl_add_item.c
@@ -1,13 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
- * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
- *
- * - DESCRIPTION HERE
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl_add_item.h b/src/plugins/rssyl/rssyl_add_item.h
index 5e5e4e3b0..c16317371 100644
--- a/src/plugins/rssyl/rssyl_add_item.h
+++ b/src/plugins/rssyl/rssyl_add_item.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RSSYL_ADD_ITEM_H
 #define __RSSYL_ADD_ITEM_H
 
diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
index 37f05b72c..eee3a134b 100644
--- a/src/plugins/rssyl/rssyl_cb_menu.c
+++ b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -1,14 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
- * This file (C) 2005-2022 Andrej Kacian <andrej at kacian.sk> and the
- * Claws Mail team
- *
- * - callback handler functions for folderview rssyl context menu items
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl_cb_menu.h b/src/plugins/rssyl/rssyl_cb_menu.h
index 258f9a5a8..59a964d7a 100644
--- a/src/plugins/rssyl/rssyl_cb_menu.h
+++ b/src/plugins/rssyl/rssyl_cb_menu.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RSSYL_MENU_CB
 #define __RSSYL_MENU_CB
 
diff --git a/src/plugins/rssyl/rssyl_deleted.c b/src/plugins/rssyl/rssyl_deleted.c
index 0ba84b610..d5883c080 100644
--- a/src/plugins/rssyl/rssyl_deleted.c
+++ b/src/plugins/rssyl/rssyl_deleted.c
@@ -1,13 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
- * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
- *
- * - handling of info about user-deleted feed items
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl_deleted.h b/src/plugins/rssyl/rssyl_deleted.h
index d0f76df1c..949a18c7c 100644
--- a/src/plugins/rssyl/rssyl_deleted.h
+++ b/src/plugins/rssyl/rssyl_deleted.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RSSYL_DELETED_H
 #define __RSSYL_DELETED_H
 
diff --git a/src/plugins/rssyl/rssyl_feed.c b/src/plugins/rssyl/rssyl_feed.c
index cbc14596d..e762d93f2 100644
--- a/src/plugins/rssyl/rssyl_feed.c
+++ b/src/plugins/rssyl/rssyl_feed.c
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl_feed.h b/src/plugins/rssyl/rssyl_feed.h
index 00f0792f3..36749bede 100644
--- a/src/plugins/rssyl/rssyl_feed.h
+++ b/src/plugins/rssyl/rssyl_feed.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RSSYL_FEED_H
 #define __RSSYL_FEED_H
 
diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
index 63d781e5b..795a15869 100644
--- a/src/plugins/rssyl/rssyl_feed_props.c
+++ b/src/plugins/rssyl/rssyl_feed_props.c
@@ -1,13 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2021 the Claws Mail team
- * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
- *
- * - Plugin preferences
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl_feed_props.h b/src/plugins/rssyl/rssyl_feed_props.h
index d1e088b2b..eec5009f8 100644
--- a/src/plugins/rssyl/rssyl_feed_props.h
+++ b/src/plugins/rssyl/rssyl_feed_props.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RSSYL_FEED_PROPS
 #define __RSSYL_FEED_PROPS
 
diff --git a/src/plugins/rssyl/rssyl_gtk.c b/src/plugins/rssyl/rssyl_gtk.c
index e41d51197..a9ffa6725 100644
--- a/src/plugins/rssyl/rssyl_gtk.c
+++ b/src/plugins/rssyl/rssyl_gtk.c
@@ -1,13 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
- * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
- *
- * - GUI handling functions
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl_gtk.h b/src/plugins/rssyl/rssyl_gtk.h
index ba8ddb7f1..c1bb4f289 100644
--- a/src/plugins/rssyl/rssyl_gtk.h
+++ b/src/plugins/rssyl/rssyl_gtk.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RSSYL_GTK
 #define __RSSYL_GTK
 
diff --git a/src/plugins/rssyl/rssyl_parse_feed.c b/src/plugins/rssyl/rssyl_parse_feed.c
index bc6a47a1e..f571991b1 100644
--- a/src/plugins/rssyl/rssyl_parse_feed.c
+++ b/src/plugins/rssyl/rssyl_parse_feed.c
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl_parse_feed.h b/src/plugins/rssyl/rssyl_parse_feed.h
index 5e4a3f32f..fce2f3914 100644
--- a/src/plugins/rssyl/rssyl_parse_feed.h
+++ b/src/plugins/rssyl/rssyl_parse_feed.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RSSYL_PARSE_FEED
 #define __RSSYL_PARSE_FEED
 
diff --git a/src/plugins/rssyl/rssyl_prefs.c b/src/plugins/rssyl/rssyl_prefs.c
index bf2249b00..d95373473 100644
--- a/src/plugins/rssyl/rssyl_prefs.c
+++ b/src/plugins/rssyl/rssyl_prefs.c
@@ -1,13 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2021 the Claws Mail team
- * This file (C) 2005-2015 Andrej Kacian <andrej at kacian.sk>
- *
- * - Plugin preferences
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl_prefs.h b/src/plugins/rssyl/rssyl_prefs.h
index f597b4fd3..d9573a16b 100644
--- a/src/plugins/rssyl/rssyl_prefs.h
+++ b/src/plugins/rssyl/rssyl_prefs.h
@@ -1,13 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
- * This file (C) 2005-2015 Andrej Kacian <andrej at kacian.sk>
- *
- * - Plugin preferences
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __RSSYL_PREFS
diff --git a/src/plugins/rssyl/rssyl_subscribe.c b/src/plugins/rssyl/rssyl_subscribe.c
index 6a21c32ab..63d196c2b 100644
--- a/src/plugins/rssyl/rssyl_subscribe.c
+++ b/src/plugins/rssyl/rssyl_subscribe.c
@@ -1,13 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
- * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
- *
- * - DESCRIPTION HERE
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl_subscribe.h b/src/plugins/rssyl/rssyl_subscribe.h
index 56e90949f..4e18c059d 100644
--- a/src/plugins/rssyl/rssyl_subscribe.h
+++ b/src/plugins/rssyl/rssyl_subscribe.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RSSYL_SUBSCRIBE_H
 #define __RSSYL_SUBSCRIBE_H
 
diff --git a/src/plugins/rssyl/rssyl_subscribe_gtk.c b/src/plugins/rssyl/rssyl_subscribe_gtk.c
index 4e9043a82..6960101ed 100644
--- a/src/plugins/rssyl/rssyl_subscribe_gtk.c
+++ b/src/plugins/rssyl/rssyl_subscribe_gtk.c
@@ -1,13 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team
- * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
- *
- * - Dialog which appears when manually subscribing a new feed.
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl_subscribe_gtk.h b/src/plugins/rssyl/rssyl_subscribe_gtk.h
index 102302284..6d5a7bee3 100644
--- a/src/plugins/rssyl/rssyl_subscribe_gtk.h
+++ b/src/plugins/rssyl/rssyl_subscribe_gtk.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RSSYL_SUBSCRIBE_GTK_H
 #define __RSSYL_SUBSCRIBE_GTK_H
 
diff --git a/src/plugins/rssyl/rssyl_update_comments.c b/src/plugins/rssyl/rssyl_update_comments.c
index cf6c618a2..3cd1aa499 100644
--- a/src/plugins/rssyl/rssyl_update_comments.c
+++ b/src/plugins/rssyl/rssyl_update_comments.c
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl_update_comments.h b/src/plugins/rssyl/rssyl_update_comments.h
index 3ce56e426..a8960d2bd 100644
--- a/src/plugins/rssyl/rssyl_update_comments.h
+++ b/src/plugins/rssyl/rssyl_update_comments.h
@@ -1,4 +1,20 @@
-
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #ifndef __RSSYL_UPDATE_COMMENTS
 #define __RSSYL_UPDATE_COMMENTS
diff --git a/src/plugins/rssyl/rssyl_update_feed.c b/src/plugins/rssyl/rssyl_update_feed.c
index bd4ead851..8620959f5 100644
--- a/src/plugins/rssyl/rssyl_update_feed.c
+++ b/src/plugins/rssyl/rssyl_update_feed.c
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl_update_feed.h b/src/plugins/rssyl/rssyl_update_feed.h
index 81722343f..3a353bba5 100644
--- a/src/plugins/rssyl/rssyl_update_feed.h
+++ b/src/plugins/rssyl/rssyl_update_feed.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RSSYL_UPDATE_FEED
 #define __RSSYL_UPDATE_FEED
 
diff --git a/src/plugins/rssyl/rssyl_update_format.c b/src/plugins/rssyl/rssyl_update_format.c
index 973458772..b9f4c1b6a 100644
--- a/src/plugins/rssyl/rssyl_update_format.c
+++ b/src/plugins/rssyl/rssyl_update_format.c
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2006 Andrej Kacian <andrej at kacian.sk>
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/rssyl_update_format.h b/src/plugins/rssyl/rssyl_update_format.h
index 7e3a858ca..0861b5c94 100644
--- a/src/plugins/rssyl/rssyl_update_format.h
+++ b/src/plugins/rssyl/rssyl_update_format.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2006-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RSSYL_UPDATE_FORMAT
 #define __RSSYL_UPDATE_FORMAT
 
diff --git a/src/plugins/rssyl/strutils.c b/src/plugins/rssyl/strutils.c
index 726768728..6a670b7ba 100644
--- a/src/plugins/rssyl/strutils.c
+++ b/src/plugins/rssyl/strutils.c
@@ -1,12 +1,10 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2005 Andrej Kacian <andrej at kacian.sk>
- *
- * - a strreplace function (something like sed's s/foo/bar/g)
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/rssyl/strutils.h b/src/plugins/rssyl/strutils.h
index 853d118a4..72af2c645 100644
--- a/src/plugins/rssyl/strutils.h
+++ b/src/plugins/rssyl/strutils.h
@@ -1,3 +1,21 @@
+/*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2023 the Claws Mail Team and Andrej Kacian <andrej at kacian.sk>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __STRUTILS_H
 #define __STRUTILS_H
 

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


hooks/post-receive
-- 
Claws Mail

From paul at claws-mail.org  Fri Feb 24 15:21:56 2023
From: paul at claws-mail.org (paul at claws-mail.org)
Date: Fri, 24 Feb 2023 15:21:56 +0000 (UTC)
Subject: [Commits] [SCM] claws branch, master, updated. 4.1.1-47-ge2e7f63c6
Message-ID: <20230224152156.33C7040280@claws-mail.org>

The branch, master has been updated
       via  e2e7f63c6a0a762dd8d823eb29ad850e665317ff (commit)
      from  bed3a071ac85a6876e8866d5581b80a17cbe1fe7 (commit)

Summary of changes:
 configure.ac                     | 19 ----------
 src/plugins/fancy/Makefile.am    |  4 +--
 src/plugins/fancy/fancy_prefs.c  | 77 ++++++++--------------------------------
 src/plugins/fancy/fancy_prefs.h  |  9 ++---
 src/plugins/fancy/fancy_viewer.c | 19 +---------
 src/plugins/fancy/fancy_viewer.h |  8 ++---
 6 files changed, 22 insertions(+), 114 deletions(-)


- Log -----------------------------------------------------------------
commit e2e7f63c6a0a762dd8d823eb29ad850e665317ff
Author: Paul <paul at claws-mail.org>
Date:   Fri Feb 24 15:21:52 2023 +0000

    remove checks for libsoup and libsoup-gnome, and remove the proxy pref from the fancy plugin because none of this is used
    
    thanks to P?der Rezs? for the hint

diff --git a/configure.ac b/configure.ac
index 03a87b4d2..760e1b9ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1281,25 +1281,6 @@ fi
 AC_SUBST(WEBKIT_LIBS)
 AC_SUBST(WEBKIT_CFLAGS)
 
-dnl libsoup ********************************************************************
-PKG_CHECK_MODULES(LIBSOUP, libsoup-3.0, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
-if test x"$HAVE_LIBSOUP" = xno; then
-	PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
-fi
-if test x"$HAVE_LIBSOUP" = xyes; then
-	AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup is available])
-fi
-AC_SUBST(LIBSOUP_CFLAGS)
-AC_SUBST(LIBSOUP_LIBS)
-
-dnl libsoup-gnome **************************************************************
-PKG_CHECK_MODULES(LIBSOUP_GNOME, libsoup-gnome-2.4 >= 2.26, HAVE_LIBSOUP_GNOME=yes, HAVE_LIBSOUP_GNOME=no)
-if test x"$HAVE_LIBSOUP_GNOME" = xyes; then
-	AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup_gnome is available])
-fi
-AC_SUBST(LIBSOUP_GNOME_CFLAGS)
-AC_SUBST(LIBSOUP_GNOME_LIBS)
-
 dnl libarchive *****************************************************************
 PKG_CHECK_MODULES(LIBARCHIVE, libarchive, HAVE_ARCHIVE=yes, HAVE_ARCHIVE=no)
 AC_SUBST(ARCHIVE_LIBS)
diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am
index 0d559f089..b8e4d3bba 100644
--- a/src/plugins/fancy/Makefile.am
+++ b/src/plugins/fancy/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 the Claws Mail team.
+# Copyright 1999-2023 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
@@ -28,7 +28,6 @@ EXTRA_fancy_la_DEPENDENCIES = $(plugin_extra_deps)
 fancy_la_LIBADD = $(plugin_libadd) \
 	$(GTK_LIBS) \
 	$(WEBKIT_LIBS) \
-	$(LIBSOUP_GNOME_LIBS) \
 	$(CURL_LIBS)
 
 fancy_la_CPPFLAGS = \
@@ -37,7 +36,6 @@ fancy_la_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(ENCHANT_CFLAGS) \
 	$(WEBKIT_CFLAGS) \
-	$(LIBSOUP_GNOME_CFLAGS) \
 	$(CURL_CFLAGS) \
 	-DFANCY_WEB_EXTENSIONS_DIR=\""$(pkglibdir)/web_extensions"\" \
 	-DFANCY_WEB_EXTENSION_FILE=\""fancywebextension"\"
diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
index 5bc07fe0a..31f694e7c 100644
--- a/src/plugins/fancy/fancy_prefs.c
+++ b/src/plugins/fancy/fancy_prefs.c
@@ -46,11 +46,8 @@
 
 FancyPrefs fancy_prefs;
 
-static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str);
+// static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str);
 
-#ifdef HAVE_LIBSOUP_GNOME
-static void prefs_disable_fancy_proxy(GtkWidget *checkbox, GtkWidget *block);
-#endif
 typedef struct _FancyPrefsPage FancyPrefsPage;
 
 struct _FancyPrefsPage {
@@ -61,11 +58,8 @@ struct _FancyPrefsPage {
 	GtkWidget *enable_plugins;
 	GtkWidget *enable_java;
 	GtkWidget *open_external;
-#ifdef HAVE_LIBSOUP_GNOME
-	GtkWidget *gnome_proxy_checkbox;
-#endif
-	GtkWidget *proxy_checkbox;
-	GtkWidget *proxy_str;
+/*	GtkWidget *proxy_checkbox;
+	GtkWidget *proxy_str; */
 	GtkWidget *stylesheet;
 };
 
@@ -84,14 +78,10 @@ static PrefParam param[] = {
 		NULL, NULL, NULL},
 		{"enable_java", "FALSE", &fancy_prefs.enable_java, P_BOOL,
 		NULL, NULL, NULL},
-#ifdef HAVE_LIBSOUP_GNOME
-		{"enable_gnome_proxy","FALSE", &fancy_prefs.enable_gnome_proxy, P_BOOL,
-		NULL, NULL, NULL},
-#endif
-		{"enable_proxy", "FALSE", &fancy_prefs.enable_proxy, P_BOOL,
+/*		{"enable_proxy", "FALSE", &fancy_prefs.enable_proxy, P_BOOL,
 		NULL, NULL, NULL},
 		{"proxy_server", "http://SERVERNAME:PORT", &fancy_prefs.proxy_str, P_STRING,
-		NULL, NULL, NULL},
+		NULL, NULL, NULL}, */
 		{"stylesheet", "", &fancy_prefs.stylesheet, P_STRING, NULL, NULL, NULL},
 		{0,0,0,0,0,0,0}
 };
@@ -180,14 +170,11 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
 	FancyPrefsPage *prefs_page = (FancyPrefsPage *) page;
 
 	GtkWidget *vbox;
-#ifdef HAVE_LIBSOUP_GNOME
-	GtkWidget *gnome_proxy_checkbox;
-#endif
-	GtkWidget *proxy_checkbox;
+/*	GtkWidget *proxy_checkbox;
 	GtkWidget *proxy_str;
 	GtkWidget *vbox_proxy;
 	GtkWidget *frame_proxy;
-
+*/
 	GtkWidget *frame_remote;
 	GtkWidget *vbox_remote;
 	GtkWidget *remote_label;
@@ -204,25 +191,12 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
 	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
 	gtk_widget_show(vbox);
-
+/*
 	GtkWidget *block = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
 
 	vbox_proxy = gtkut_get_options_frame(vbox, &frame_proxy, _("Proxy"));
-#ifdef HAVE_LIBSOUP_GNOME
-	gnome_proxy_checkbox = gtk_check_button_new_with_label(_("Use GNOME's proxy settings"));	
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gnome_proxy_checkbox),
-				     fancy_prefs.enable_gnome_proxy);
-	gtk_box_pack_start(GTK_BOX(vbox_proxy), gnome_proxy_checkbox, FALSE, FALSE, 0);
-	gtk_widget_show(gnome_proxy_checkbox);
-	g_signal_connect(G_OBJECT(gnome_proxy_checkbox), "toggled",
-			 G_CALLBACK(prefs_disable_fancy_proxy), block);
-#endif
 	proxy_checkbox = gtk_check_button_new_with_label(_("Use proxy"));
 	proxy_str = gtk_entry_new();
-#ifdef HAVE_LIBSOUP_GNOME
-	if (fancy_prefs.enable_gnome_proxy)
-		gtk_widget_set_sensitive(proxy_checkbox, FALSE);
-#endif
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(proxy_checkbox),
 				     fancy_prefs.enable_proxy);
 	prefs_set_proxy_entry_sens(proxy_checkbox, GTK_ENTRY(proxy_str));
@@ -234,7 +208,7 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
 	gtk_box_pack_start(GTK_BOX(block), proxy_str, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox_proxy), block, FALSE, FALSE, 0);
 	gtk_widget_show_all(vbox_proxy);
-
+*/
 	vbox_remote = gtkut_get_options_frame(vbox, &frame_remote, _("Remote resources"));
 	remote_label = gtk_label_new(_("Loading remote resources can lead to some privacy issues.\n"
 					"When remote content loading is disabled, nothing will be requested\n"
@@ -323,12 +297,8 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
 	pref_set_entry_from_pref(GTK_ENTRY(stylesheet), fancy_prefs.stylesheet);
 	g_signal_emit_by_name(G_OBJECT(stylesheet), "changed", stylesheet_edit_button);
 
-
-#ifdef HAVE_LIBSOUP_GNOME
-	prefs_page->gnome_proxy_checkbox = gnome_proxy_checkbox;
-#endif
-	prefs_page->proxy_checkbox = proxy_checkbox;
-	prefs_page->proxy_str = proxy_str;
+/*	prefs_page->proxy_checkbox = proxy_checkbox;
+	prefs_page->proxy_str = proxy_str; */
 	prefs_page->enable_remote_content = enable_remote_content;
 	prefs_page->enable_images = enable_images;
 	prefs_page->enable_scripts = enable_scripts;
@@ -374,25 +344,12 @@ static void fancy_prefs_stylesheet_changed_cb(GtkWidget *widget, gpointer data)
 	const gchar *stylesheet = gtk_entry_get_text(GTK_ENTRY(widget));
 	gtk_widget_set_sensitive(GTK_WIDGET(data), (*stylesheet)? TRUE: FALSE);
 }
-
+/*
 static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str) {
 	gtk_widget_set_sensitive(GTK_WIDGET(entry_str),
 				 gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
 }
-
-#ifdef HAVE_LIBSOUP_GNOME
-static void prefs_disable_fancy_proxy(GtkWidget *checkbox, GtkWidget *block) {
-	gboolean toggle = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox));
-	gtk_widget_set_sensitive(block, !toggle);
-	GList *list = g_list_first(gtk_container_get_children(GTK_CONTAINER(block)));
-	if (toggle) {
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(list->data), FALSE);
-	}
-	else {
-		gtk_widget_set_sensitive(GTK_WIDGET(list->data), TRUE);
-	}
-}
-#endif
+*/
 static void destroy_fancy_prefs_page(PrefsPage *page)
 {
 	/* Do nothing! */
@@ -425,10 +382,6 @@ static void save_fancy_prefs_page(PrefsPage *page)
 {
 		FancyPrefsPage *prefs_page = (FancyPrefsPage *) page;
 	
-#ifdef HAVE_LIBSOUP_GNOME
-		fancy_prefs.enable_gnome_proxy = gtk_toggle_button_get_active
-				(GTK_TOGGLE_BUTTON(prefs_page->gnome_proxy_checkbox));
-#endif
 		fancy_prefs.enable_images = gtk_toggle_button_get_active
 				(GTK_TOGGLE_BUTTON(prefs_page->enable_images));
 		fancy_prefs.enable_remote_content = gtk_toggle_button_get_active
@@ -441,9 +394,9 @@ static void save_fancy_prefs_page(PrefsPage *page)
 				(GTK_TOGGLE_BUTTON(prefs_page->enable_java));
 		fancy_prefs.open_external = combobox_get_active_data
 				(GTK_COMBO_BOX(prefs_page->open_external));
-		fancy_prefs.enable_proxy = gtk_toggle_button_get_active
+/*		fancy_prefs.enable_proxy = gtk_toggle_button_get_active
 				(GTK_TOGGLE_BUTTON(prefs_page->proxy_checkbox));
-		fancy_prefs.proxy_str = pref_get_pref_from_entry(GTK_ENTRY(prefs_page->proxy_str));
+		fancy_prefs.proxy_str = pref_get_pref_from_entry(GTK_ENTRY(prefs_page->proxy_str)); */
 #ifdef G_OS_WIN32
 		/* pref_get_pref_from_entry() escapes the backslashes in strings,
 		 * we do not want that, since this entry contains a Windows path.
diff --git a/src/plugins/fancy/fancy_prefs.h b/src/plugins/fancy/fancy_prefs.h
index 9b505c5cf..e0a400df1 100644
--- a/src/plugins/fancy/fancy_prefs.h
+++ b/src/plugins/fancy/fancy_prefs.h
@@ -1,6 +1,6 @@
 /* 
  * Claws Mail -- A GTK based, lightweight, and fast e-mail client
- * Copyright(C) 1999-2014 the Claws Mail Team
+ * Copyright(C) 1999-2023 the Claws Mail Team
  * == Fancy Plugin ==
  * This file Copyright (C) 2009 -2014 Salvatore De Paolis
  * <iwkse at claws-mail.org> and the Claws Mail Team
@@ -35,11 +35,8 @@ struct _FancyPrefs
 	gboolean enable_java;
 	gboolean open_external;
 	gint zoom_level;
-#ifdef HAVE_LIBSOUP_GNOME
-	gboolean enable_gnome_proxy;
-#endif
-	gboolean enable_proxy;
-	gchar *proxy_str;
+	// gboolean enable_proxy;
+	// gchar *proxy_str;
 	gchar *stylesheet;
 };
 
diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index 48f312ec7..ba51867d6 100644
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -1,7 +1,7 @@
 /*
  * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * == Fancy Plugin ==
- * Copyright(C) 1999-2022 the Claws Mail Team
+ * Copyright(C) 1999-2023 the Claws Mail Team
  * This file Copyright (C) 2009-2014 Salvatore De Paolis
  * <iwkse at claws-mail.org> and the Claws Mail Team
  *
@@ -1106,23 +1106,6 @@ static MimeViewer *fancy_viewer_create(void)
 	viewer->mimeviewer.scroll_one_line = fancy_scroll_one_line;
 	viewer->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
 
-/*#ifdef HAVE_LIBSOUP_GNOME
-  TODO webkit_get_default_session() missing 
-   *     enum WebKitNetworkProxySettings
-   * */
- /* Use GNOME proxy settings through libproxy */
-/*	if (fancy_prefs.enable_gnome_proxy) {
-		SoupSession *session = webkit_get_default_session();
-		soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
-	}
-#endif
-	
-	if (fancy_prefs.enable_proxy) {
-		SoupSession *session = webkit_get_default_session();
-		SoupURI* pURI = soup_uri_new(fancy_prefs.proxy_str);
-		g_object_set(session, "proxy-uri", pURI, NULL);
-	}
-*/
 	viewer->settings = webkit_settings_new();
 	g_object_set(viewer->settings, "user-agent", "Fancy Viewer", NULL);
 	viewer->scrollwin = gtk_scrolled_window_new(NULL, NULL);
diff --git a/src/plugins/fancy/fancy_viewer.h b/src/plugins/fancy/fancy_viewer.h
index 0dc7da8f3..a52c46c62 100644
--- a/src/plugins/fancy/fancy_viewer.h
+++ b/src/plugins/fancy/fancy_viewer.h
@@ -1,8 +1,8 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * == Fancy Plugin ==
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail Team
- * This file Copyright (C) 2009-2013 Salvatore De Paolis <iwkse at claws-mail.org>
+ * Copyright (C) 1999-2023 the Claws Mail Team
+ * This file Copyright (C) 2009-2023 Salvatore De Paolis <iwkse at claws-mail.org>
  *  and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -51,10 +51,6 @@
 #include <curl/curlver.h>
 #include "filesel.h"
 
-#ifdef HAVE_LIBSOUP_GNOME
-#include <libsoup/soup-gnome.h>
-#endif
-
 typedef enum _NavigationMode {
 	NAV_DEFAULT,
 	NAV_INNER,

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


hooks/post-receive
-- 
Claws Mail

From lbickley at bickleywest.com  Fri Feb 24 20:28:39 2023
From: lbickley at bickleywest.com (Lyle Bickley)
Date: Fri, 24 Feb 2023 12:28:39 -0800
Subject: [Commits] [SCM] claws branch, master,
 updated. 4.1.1-45-g568c901bc
In-Reply-To: <20230224092534.7300C40421@claws-mail.org>
References: <20230224092534.7300C40421@claws-mail.org>
Message-ID: <20230224122839.569ab980@asrock.bcwi.net>

Hi Paul,

Downloaded the latest git.

No errors in configuration.
No errors (other than standard warnings) in compilation
No errors in make install

Current settings:
version 4.1.1git47

System Information
GTK 3.24.34 / GLib 2.70.5
Locale: en_US.UTF-8 (charset: UTF-8)
Operating System: Linux 5.14.21-150400.24.46-default (x86_64)

opensuse leap 15.4

LightHTML works OK
Fancy crashes claws
-------------------
(as in  claws task is killed)

Best,
Lyle

---




On Fri, 24 Feb 2023 09:25:34 +0000 (UTC)
paul at claws-mail.org wrote:

> The branch, master has been updated
>        via  568c901bca98f54d98de89d7bd8f3acdc2cc20af (commit)
>       from  914102789bbf9b6f333bc94d7041ff836ccb9585 (commit)
> 
> Summary of changes:
>  configure.ac | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> 
> - Log -----------------------------------------------------------------
> commit 568c901bca98f54d98de89d7bd8f3acdc2cc20af
> Author: Paul <paul at claws-mail.org>
> Date:   Fri Feb 24 09:25:29 2023 +0000
> 
>     fix bug 4666, 'fancy plugin doesn't build with libwebkit2gtk-4.1'
> 
> diff --git a/configure.ac b/configure.ac
> index fdb7db51c..03a87b4d2 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1274,12 +1274,18 @@ AC_SUBST(EXPAT_CFLAGS)
>  AC_SUBST(EXPAT_LIBS)
>  
>  dnl webkit
> *********************************************************************
> -PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.0 >= 2.18.0, HAVE_WEBKIT=yes,
> HAVE_WEBKIT=no) +PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.1, HAVE_WEBKIT=yes,
> HAVE_WEBKIT=no) +if test x"$HAVE_WEBKIT" = xno; then
> +	PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.0 >= 2.18.0,
> HAVE_WEBKIT=yes, HAVE_WEBKIT=no) +fi
>  AC_SUBST(WEBKIT_LIBS)
>  AC_SUBST(WEBKIT_CFLAGS)
>  
>  dnl libsoup
> ********************************************************************
> -PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
> +PKG_CHECK_MODULES(LIBSOUP, libsoup-3.0, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
> +if test x"$HAVE_LIBSOUP" = xno; then
> +	PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes,
> HAVE_LIBSOUP=no) +fi
>  if test x"$HAVE_LIBSOUP" = xyes; then
>  	AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup is available])
>  fi
> @@ -1621,7 +1627,7 @@ if test x"$enable_fancy_plugin" != xno; then
>  	dependencies_missing=""
>  
>  	if test x"$HAVE_WEBKIT" = xno; then
> -		dependencies_missing="libwebkit2gtk-4.0
> $dependencies_missing"
> +		dependencies_missing="libwebkit2gtk-4.0 or greater
> $dependencies_missing" fi
>  	if test x"$HAVE_CURL" = xno; then
>  		dependencies_missing="libcurl $dependencies_missing"
> 
> -----------------------------------------------------------------------
> 
> 
> hooks/post-receive



-- 
73   NM6Y
Bickley Consulting West
https://bickleywest.com

"Black holes are where God is dividing by zero"