2006-09-26 [colin] 2.5.1cvs5

	* src/matcher.c
		Fix condition

diff --git a/ChangeLog b/ChangeLog
index a13fdc3037eb5948dbae2e955c5cb8d59bf7a3ac..cad1a2fea8fc99dbe1c77786dc3a8b31f533743a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-26 [colin]     2.5.1cvs5
+
+       * src/matcher.c
+               Fix condition
+

 2006-09-26 [colin]     2.5.1cvs4
 
        * src/mbox.c
 2006-09-26 [colin]     2.5.1cvs4
 
        * src/mbox.c

diff --git a/PATCHSETS b/PATCHSETS
index e0d7821e24665c1938ae25cd3c6a9a1bf7593c00..cc17d2e314bd33aa97884fb7fdd8fc595660f45f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1913,3 +1913,4 @@
 ( cvs diff -u -r 1.395.2.254 -r 1.395.2.255 src/summaryview.c;  ) > 2.5.1cvs2.patchset
 ( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/partial_download.c;  ) > 2.5.1cvs3.patchset
 ( cvs diff -u -r 1.28.2.27 -r 1.28.2.28 src/mbox.c;  ) > 2.5.1cvs4.patchset
 ( cvs diff -u -r 1.395.2.254 -r 1.395.2.255 src/summaryview.c;  ) > 2.5.1cvs2.patchset
 ( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/partial_download.c;  ) > 2.5.1cvs3.patchset
 ( cvs diff -u -r 1.28.2.27 -r 1.28.2.28 src/mbox.c;  ) > 2.5.1cvs4.patchset

+( cvs diff -u -r 1.75.2.30 -r 1.75.2.31 src/matcher.c;  ) > 2.5.1cvs5.patchset

diff --git a/configure.ac b/configure.ac
index 8b9aea8c6f9ac9cdbca2cb19034a6af26992c194..199aa4083ad7659b6bf3ce824e0d8fe1827a73bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=4
+EXTRA_VERSION=5

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/matcher.c b/src/matcher.c
index 71213a08bb6a05e0cfc6f53e8809c7042ff74267..f6d4c2415f216d7643e9385054fec4008ac64994 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -423,7 +423,7 @@ static gboolean matcherprop_string_decode_match(MatcherProp *prop, const gchar *
        }
        
        if (res == FALSE && (strchr(prop->expr, '=') || strchr(prop->expr, '_')
        }
        
        if (res == FALSE && (strchr(prop->expr, '=') || strchr(prop->expr, '_')

-                           || strchr(str, '=')) || strchr(prop->expr, '_')) {
+                           || strchr(str, '=') || strchr(str, '_'))) {

                /* 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 searching for something with an equal char, maybe 
                 * we should try to match the non-decoded string. 
                 * In case it was not qp-encoded. */