aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
author2 <NotZed@Ximian.com>2001-10-23 02:29:01 +0800
committerMichael Zucci <zucchi@src.gnome.org>2001-10-23 02:29:01 +0800
commit0787edd7b8e161e8ac1f05cded7e81983e124280 (patch)
tree0d47b4d920105ce9db22f26566f33d6c84fcd6cc /camel
parentf230e8b98a3a66356a7dd97d1e53e790b8298135 (diff)
downloadgsoc2013-evolution-0787edd7b8e161e8ac1f05cded7e81983e124280.tar
gsoc2013-evolution-0787edd7b8e161e8ac1f05cded7e81983e124280.tar.gz
gsoc2013-evolution-0787edd7b8e161e8ac1f05cded7e81983e124280.tar.bz2
gsoc2013-evolution-0787edd7b8e161e8ac1f05cded7e81983e124280.tar.lz
gsoc2013-evolution-0787edd7b8e161e8ac1f05cded7e81983e124280.tar.xz
gsoc2013-evolution-0787edd7b8e161e8ac1f05cded7e81983e124280.tar.zst
gsoc2013-evolution-0787edd7b8e161e8ac1f05cded7e81983e124280.zip
Match check against all addresses in a multiple address match. Should fix
2001-10-22 <NotZed@Ximian.com> * camel-search-private.c (camel_search_header_match): Match check against all addresses in a multiple address match. Should fix #13051. svn path=/trunk/; revision=13885
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/camel-search-private.c10
2 files changed, 10 insertions, 6 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 4c0381e549..f25879a1a3 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-22 <NotZed@Ximian.com>
+
+ * camel-search-private.c (camel_search_header_match): Match check
+ against all addresses in a multiple address match. Should fix
+ #13051.
+
2001-10-22 Dan Winship <danw@ximian.com>
* camel-pgp-mime.c (camel_pgp_mime_part_verify): Add a hack: if
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
index e392d79417..16ea04f07b 100644
--- a/camel/camel-search-private.c
+++ b/camel/camel-search-private.c
@@ -396,7 +396,7 @@ gboolean
camel_search_header_match (const char *value, const char *match, camel_search_match_t how, camel_search_t type, const char *default_charset)
{
const char *name, *addr;
- int truth = FALSE;
+ int truth = FALSE, i;
CamelInternetAddress *cia;
char *v;
@@ -425,11 +425,9 @@ camel_search_header_match (const char *value, const char *match, camel_search_ma
else
camel_address_unformat((CamelAddress *)cia, value);
- if (camel_address_length((CamelAddress *)cia) == 1) {
- camel_internet_address_get(cia, 0, &name, &addr);
- truth = (name && header_match(name, match, how))
- || (addr && header_match(addr, match, how));
- }
+ for (i=; !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);
break;
}