2006-04-28 [paul] 2.1.1cvs41

	* src/matcher.c
		fix returned quick search results when search
		term contains an underscore.
		Thanks to Colin

diff --git a/ChangeLog b/ChangeLog
index 93829cf0c7adafcf2b07ad358c6ae8ad16e96102..8626e83dfc1fd9321c17d5274ca9abefdfc1dcb3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-28 [paul]      2.1.1cvs41
+
+       * src/matcher.c
+               fix returned quick search results when search
+               term contains an underscore.
+               Thanks to Colin
+
 2006-04-28 [paul]      2.1.1cvs40
 
        * src/prefs_message.c

diff --git a/PATCHSETS b/PATCHSETS
index c41ba13f2b81625313cbdd9ef2860582ec1a2ef1..686e0c5016837fb419935d57f97128e0c3463eeb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1462,3 +1462,4 @@
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 manual/advanced.xml;  ) > 2.1.1cvs38.patchset
 ( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/wizard.c;  ) > 2.1.1cvs39.patchset
 ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_message.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_receive.c;  ) > 2.1.1cvs40.patchset
+( cvs diff -u -r 1.75.2.20 -r 1.75.2.21 src/matcher.c;  ) > 2.1.1cvs41.patchset

diff --git a/configure.ac b/configure.ac
index ccf63ac83abfdbb566f6ad8d11d80dd70fe5c267..1e313218a881d62d59185e305f527035e171a9e7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=40
+EXTRA_VERSION=41
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/matcher.c b/src/matcher.c
index 85dd55351b7a465f329115c2207f61c8dcc6d831..ad9eced2612f75aff00fde839a7b2fc53f1fd1d7 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -390,7 +390,7 @@ static gboolean matcherprop_string_decode_match(MatcherProp *prop, const gchar *
                res = matcherprop_string_match(prop, tmp);
        }
        
-       if (res == FALSE && strchr(prop->expr, '=')) {
+       if (res == FALSE && strchr(prop->expr, '=') || 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. */