[Commits] [SCM] claws branch, master, updated. 3.16.0-213-g1af1326

[wwp at claws-mail.org]

The branch, master has been updated
       via  1af1326d6177e84d1d3cb2693732912e3f6ab1f5 (commit)
      from  a21c0db937e5343b5c001c582fe17997d7fcc65d (commit)

Summary of changes:
 src/matcher.c       |    8 ++++++--
 src/prefs_matcher.c |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 1af1326d6177e84d1d3cb2693732912e3f6ab1f5
Author: wwp <wwp at free.fr>
Date:   Tue Jun 12 11:27:32 2018 +0200

    Include Resent-From and Resent-To in Any/All header(s) (in addressbook) matcher rules.

diff --git a/src/matcher.c b/src/matcher.c
index 40ed4ca..ab42c75 100644
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -1385,7 +1385,9 @@ static gboolean matcherprop_match_one_header(MatcherProp *matcher,
 					 procheader_headername_equal(header->name, "To") ||
 					 procheader_headername_equal(header->name, "Cc") ||
 					 procheader_headername_equal(header->name, "Reply-To") ||
-					 procheader_headername_equal(header->name, "Sender"))
+					 procheader_headername_equal(header->name, "Sender") ||
+					 procheader_headername_equal(header->name, "Resent-From") ||
+					 procheader_headername_equal(header->name, "Resent-To"))
 					address_list = address_list_append(address_list, header->body);
 				procheader_header_free(header);
 				if (address_list == NULL)
@@ -1496,7 +1498,9 @@ static gboolean matcherlist_match_headers(MatcherList *matchers, FILE *fp)
 					 procheader_headername_equal(header->name, "To") ||
 					 procheader_headername_equal(header->name, "Cc") ||
 					 procheader_headername_equal(header->name, "Reply-To") ||
-					 procheader_headername_equal(header->name, "Sender"))) {
+					 procheader_headername_equal(header->name, "Sender") ||
+					 procheader_headername_equal(header->name, "Resent-From") ||
+					 procheader_headername_equal(header->name, "Resent-To"))) {
 
 					if (strcasecmp(matcher->header, "Any") == 0)
 						match = MATCH_ANY;
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index d987f42..874cc4f 100644
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -703,7 +703,7 @@ static void prefs_matcher_create(void)
 	/* address header name */
 	header_addr_combo = combobox_text_new(TRUE,
 			      C_("Filtering Matcher Menu", "All"), _("Any"),
-			      "From", "To", "Cc", "Reply-To", "Sender", NULL);
+			      "From", "To", "Cc", "Reply-To", "Sender", "Resent-From", "Resent-To", NULL);
 	gtk_box_pack_start(GTK_BOX(match_hbox), header_addr_combo, FALSE, FALSE, 0);
 	header_addr_entry = gtk_bin_get_child(GTK_BIN((header_addr_combo)));
 	gtk_widget_set_size_request(header_addr_combo, 150, -1);

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


hooks/post-receive
-- 
Claws Mail