aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-folder-search.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2001-12-01 07:43:39 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-12-01 07:43:39 +0800
commit0c3435a0e11086b8c9d39d87596ffe5ce7f5b133 (patch)
tree9d361c2e57913c76cfa7f9641726a7103c79e77f /camel/camel-folder-search.c
parentad9d11c750290405cad22ba46b0f26ed3bb73155 (diff)
downloadgsoc2013-evolution-0c3435a0e11086b8c9d39d87596ffe5ce7f5b133.tar
gsoc2013-evolution-0c3435a0e11086b8c9d39d87596ffe5ce7f5b133.tar.gz
gsoc2013-evolution-0c3435a0e11086b8c9d39d87596ffe5ce7f5b133.tar.bz2
gsoc2013-evolution-0c3435a0e11086b8c9d39d87596ffe5ce7f5b133.tar.lz
gsoc2013-evolution-0c3435a0e11086b8c9d39d87596ffe5ce7f5b133.tar.xz
gsoc2013-evolution-0c3435a0e11086b8c9d39d87596ffe5ce7f5b133.tar.zst
gsoc2013-evolution-0c3435a0e11086b8c9d39d87596ffe5ce7f5b133.zip
Don't use regex matching. Fixes bug #16227.
2001-11-29 Jeffrey Stedfast <fejj@ximian.com> * camel-folder-search.c (search_body_contains): Don't use regex matching. Fixes bug #16227. * camel-mime-message.c (best_encoding): Check the content-object's mime type, not the mime part types. Should fix bug #15843. 2001-11-27 Jeffrey Stedfast <fejj@ximian.com> * providers/imap/camel-imap-folder.c (get_content): Return NULL if construct_from_stream fails. (get_message): Same. (get_message_simple): Here too. (add_message_from_data): And here. svn path=/trunk/; revision=14834
Diffstat (limited to 'camel/camel-folder-search.c')
-rw-r--r--camel/camel-folder-search.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index d8779d08ae..993de40801 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -752,7 +752,7 @@ search_body_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, Cam
}
} else if (search->folder) {
/* we do a 'slow' direct search */
- if (camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_ICASE, argc, argv, search->priv->ex) == 0) {
+ if (camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_ICASE, argc, argv, search->priv->ex) == 0) {
truth = match_message(search->folder, camel_message_info_uid(search->current), &pattern, search->priv->ex);
regfree(&pattern);
}
@@ -802,7 +802,7 @@ search_body_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, Cam
} else if (search->folder) {
/* do a slow search */
r->value.ptrarray = g_ptr_array_new();
- if (camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_ICASE, argc, argv, search->priv->ex) == 0) {
+ if (camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_ICASE, argc, argv, search->priv->ex) == 0) {
if (search->summary) {
for (i=0;i<search->summary->len;i++) {
CamelMessageInfo *info = g_ptr_array_index(search->summary, i);