+2006-03-26 [colin] 2.0.0cvs171
+
+ * src/matcher.c
+ Fix corner cases in body search. This is still a
+ hack... It seems impossible to make it good and
+ reasonably fast at the same time.
+
2006-03-26 [colin] 2.0.0cvs170
* src/summaryview.c
( cvs diff -u -r 1.12.2.32 -r 1.12.2.33 src/action.c; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_msg_colors.c; cvs diff -u -r 1.395.2.186 -r 1.395.2.187 src/summaryview.c; cvs diff -u -r 1.68.2.20 -r 1.68.2.21 src/summaryview.h; cvs diff -u -r 1.23.2.26 -r 1.23.2.27 src/plugins/spamassassin/spamassassin_gtk.c; ) > 2.0.0cvs168.patchset
( cvs diff -u -r 1.75.2.17 -r 1.75.2.18 src/matcher.c; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/common/quoted-printable.c; cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/common/quoted-printable.h; ) > 2.0.0cvs169.patchset
( cvs diff -u -r 1.395.2.187 -r 1.395.2.188 src/summaryview.c; ) > 2.0.0cvs170.patchset
+( cvs diff -u -r 1.75.2.18 -r 1.75.2.19 src/matcher.c; ) > 2.0.0cvs171.patchset
}
}
+/* FIXME body search is a hack. */
static gboolean matcherprop_string_decode_match(MatcherProp *prop, const gchar *str)
{
gchar *utf = NULL;
res = matcherprop_string_match(prop, tmp);
}
+ if (res == FALSE && strchr(prop->expr, '=')) {
+ /* if searching for something with an equal char, maybe
+ * we should try to match the non-decoded string.
+ * In case it was not qp-encoded. */
+ if (!g_utf8_validate(str, -1, NULL)) {
+ utf = conv_codeset_strdup
+ (str, conv_get_locale_charset_str_no_utf8(),
+ CS_INTERNAL);
+ res = matcherprop_string_match(prop, utf);
+ } else {
+ res = matcherprop_string_match(prop, str);
+ }
+ }
+
/* FIXME base64 decoding is too slow, especially since text can
* easily be handled as base64. Don't even try now. */