Include Resent-From and Resent-To in Any/All header(s) (in addressbook) matcher rules.
authorwwp <wwp@free.fr>
Tue, 12 Jun 2018 09:27:32 +0000 (11:27 +0200)
committerwwp <wwp@free.fr>
Tue, 12 Jun 2018 09:27:32 +0000 (11:27 +0200)
src/matcher.c
src/prefs_matcher.c

index 40ed4ca..ab42c75 100644 (file)
@@ -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;
index d987f42..874cc4f 100644 (file)
@@ -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);