From: Colin Leroy <colin@colino.net>
Date: Tue, 26 Sep 2006 18:41:00 +0000 (+0000)
Subject: 2006-09-26 [colin]	2.5.1cvs5
X-Git-Tag: REL_2_5_2~1
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d90b057a7fbd01539b234c5041767b9cff351123;hp=27a48c43df75ef2453a970812b9311c5fd6c4fad

2006-09-26 [colin]	2.5.1cvs5

	* src/matcher.c
		Fix condition
---

diff --git a/ChangeLog b/ChangeLog
index a13fdc303..cad1a2fea 100644
--- 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
diff --git a/PATCHSETS b/PATCHSETS
index e0d7821e2..cc17d2e31 100644
--- 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.75.2.30 -r 1.75.2.31 src/matcher.c;  ) > 2.5.1cvs5.patchset
diff --git a/configure.ac b/configure.ac
index 8b9aea8c6..199aa4083 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=4
+EXTRA_VERSION=5
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/matcher.c b/src/matcher.c
index 71213a08b..f6d4c2415 100644
--- 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, '_')
-			    || 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. */