Fix bug #1797 “quicksearch could also search the Cc field”

Updated patch by Barry Warsaw <barry@python.org>, thanks!

diff --git a/src/advsearch.c b/src/advsearch.c
index 7439bb59a88bd3083830446dfbd14849a1dae6e2..962e9f67f2c996a6ad48a754209e6ec711afe537 100644 (file)
--- a/src/advsearch.c
+++ b/src/advsearch.c
@@ -395,6 +395,8 @@ static void prepare_matcher_mixed(AdvancedSearch *search)
        debug_matcher_list("tag + subject + from matcher list", search->predicate);
        prepare_matcher_header(search, MATCHCRITERIA_TO);
        debug_matcher_list("tag + subject + from + to matcher list", search->predicate);
        debug_matcher_list("tag + subject + from matcher list", search->predicate);
        prepare_matcher_header(search, MATCHCRITERIA_TO);
        debug_matcher_list("tag + subject + from + to matcher list", search->predicate);

+       prepare_matcher_header(search, MATCHCRITERIA_CC);
+       debug_matcher_list("tag + subject + from + to + cc matcher list", search->predicate);

 }
 
 static void prepare_matcher(AdvancedSearch *search)
 }
 
 static void prepare_matcher(AdvancedSearch *search)

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index c7c705e34f2e830a64f0b757fd02434c856d0261..6f4dc008579ee4cb0ee8037d75375dc15ef794c3 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -673,7 +673,7 @@ QuickSearch *quicksearch_new()
                         G_CALLBACK(searchtype_changed),
                         quicksearch);
        MENUITEM_ADD (search_type, menuitem,
                         G_CALLBACK(searchtype_changed),
                         quicksearch);
        MENUITEM_ADD (search_type, menuitem,

-                       _("From/To/Subject/Tag"), ADVANCED_SEARCH_MIXED);
+                       _("From/To/Cc/Subject/Tag"), ADVANCED_SEARCH_MIXED);

        g_signal_connect(G_OBJECT(menuitem), "activate",
                         G_CALLBACK(searchtype_changed),
                         quicksearch);
        g_signal_connect(G_OBJECT(menuitem), "activate",
                         G_CALLBACK(searchtype_changed),
                         quicksearch);