aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog1
-rw-r--r--camel/camel-mime-utils.c29
-rw-r--r--camel/camel-search-private.c2
3 files changed, 24 insertions, 8 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index f25879a1a3..70d0399299 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -3,6 +3,7 @@
* camel-search-private.c (camel_search_header_match): Match check
against all addresses in a multiple address match. Should fix
#13051.
+ (camel_search_header_match): Oops, missing i=0.
2001-10-22 Dan Winship <danw@ximian.com>
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index a76db94767..4f4090afbd 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -3715,13 +3715,28 @@ static struct {
char *name;
char *pattern;
} mail_list_magic[] = {
- { "Sender", " *owner-([^@]+)" },
- { "Sender", " *([^@]+)-owner" },
- { "Return-Path", " *owner-([^@]+)" },
- { "X-BeenThere", " *([^@]+)" },
- { "Delivered-To", " *mailing list ([^@]+)" },
- { "X-Mailing-List", " *([^@]+)" },
- { "X-Loop", " *([^@]+)" },
+ /* Sender: owner-gnome-hackers@gnome.org */
+ /* Sender: owner-gnome-hacekrs */
+ { "Sender", " *owner-([^@]+)@?([^ \n\t\r>]*)" },
+ /* Sender: gnome-hackers-owner@gnome.org */
+ /* Sender: gnome-hackers-owner */
+ { "Sender", " *([^@]+)-owner@?(([^ \n\t\r>]*)" },
+ /* Sender: owner-gnome-hackers@gnome.org */
+ /* Sender: <owner-gnome-hackers@gnome.org> */
+ /* Sender: owner-gnome-hackers */
+ /* Sender: <owner-gnome-hackers> */
+ { "Return-Path", " <?owner-([^@]+)@?([^ \n\t\r>]*)" },
+ /* X-BeenThere: gnome-hackers@gnome.org */
+ /* X-BeenThere: gnome-hackers */
+ { "X-BeenThere", " *([^@]+)@?([^ \n\t\r>]*)" },
+ /* Delivered-To: mailing list gnome-hackers@gnome.org */
+ /* Delivered-To: mailing list gnome-hackers */
+ { "Delivered-To", " *mailing list ([^@]+)@?([^ \n\t\r>]*)" },
+ /* X-Mailing-List: <gnome-hackers@gnome.org> arcive/latest/100 */
+ /* X-Mailing-List: gnome-hackers@gnome.org */
+ { "X-Mailing-List", " <?*([^@]+)@?([^ \n\t\r>]*)" },
+ /* X-Loop: gnome-hackers@gnome.org */
+ { "X-Loop", " *([^@]+)@?([^ \n\t\r>]*)" },
{ "List-Id", " *([^<]+)" },
{ "List-Post", " *<mailto:([^@]+)" },
{ "Mailing-List", " *list ([^@]+)" },
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
index 16ea04f07b..5427e6a365 100644
--- a/camel/camel-search-private.c
+++ b/camel/camel-search-private.c
@@ -425,7 +425,7 @@ camel_search_header_match (const char *value, const char *match, camel_search_ma
else
camel_address_unformat((CamelAddress *)cia, value);
- for (i=; !truth && camel_internet_address_get(cia, i, &name, &addr);i++)
+ for (i=0; !truth && camel_internet_address_get(cia, i, &name, &addr);i++)
truth = (name && header_match(name, match, how)) || (addr && header_match(addr, match, how));
camel_object_unref((CamelObject *)cia);