talons

commit 5186e70c68752f37722238f366c097cee7066685
parent b15bd9cc48ed42fda7de21bc09fba397adbf386a
Author: Tristan Chabredier <wwp@claws-mail.org>
Date:   Mon, 18 Feb 2008 17:18:05 +0000

2008-02-18 [wwp]	3.3.0cvs15

	* src/matcher.c
		Fix Engrish and make 'not' more visible in filtering debug logs.

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/matcher.c
 | 
10
+++++-----

4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-18 [wwp]	3.3.0cvs15
+
+	* src/matcher.c
+		Fix Engrish and make 'not' more visible in filtering debug logs.
+
 2008-02-15 [colin]	3.3.0cvs14
 
 	* src/matcher.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3228,3 +3228,4 @@
 ( cvs diff -u -r 1.207.2.196 -r 1.207.2.197 src/folderview.c;  ) > 3.3.0cvs12.patchset
 ( cvs diff -u -r 1.115.2.186 -r 1.115.2.187 src/main.c;  cvs diff -u -r 1.382.2.437 -r 1.382.2.438 src/compose.c;  ) > 3.3.0cvs13.patchset
 ( cvs diff -u -r 1.75.2.55 -r 1.75.2.56 src/matcher.c;  ) > 3.3.0cvs14.patchset
+( cvs diff -u -r 1.75.2.56 -r 1.75.2.57 src/matcher.c;  ) > 3.3.0cvs15.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/matcher.c b/src/matcher.c
@@ -398,7 +398,7 @@ static gboolean match_with_addresses_in_addressbook
 				&& prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH
 				&& !found) {
 			log_print(LOG_DEBUG_FILTERING,
-					"address [ %s ] doesn't match\n",
+					"address [ %s ] does NOT match\n",
 					(gchar *)walk->data);
 		}
 		g_free(walk->data);
@@ -497,7 +497,7 @@ static gboolean matcherprop_string_match(MatcherProp *prop, const gchar *str,
 						prop->matchtype == MATCHTYPE_REGEXP ? _("Case sensitive"):_("Case insensitive"));
 			} else {
 				log_print(LOG_DEBUG_FILTERING,
-						"%s value [ %s ] doesn't matches regular expression [ %s ] (%s)\n",
+						"%s value [ %s ] does NOT match regular expression [ %s ] (%s)\n",
 						debug_context, stripped, prop->expr,
 						prop->matchtype == MATCHTYPE_REGEXP ? _("Case sensitive"):_("Case insensitive"));
 			}
@@ -522,7 +522,7 @@ static gboolean matcherprop_string_match(MatcherProp *prop, const gchar *str,
 						prop->matchtype == MATCHTYPE_MATCH ? _("Case sensitive"):_("Case insensitive"));
 			} else {
 				log_print(LOG_DEBUG_FILTERING,
-						"%s value [ %s ] doesn't contains [ %s ] (%s)\n",
+						"%s value [ %s ] does NOT contain [ %s ] (%s)\n",
 						debug_context, stripped, prop->expr,
 						prop->matchtype == MATCHTYPE_MATCH ? _("Case sensitive"):_("Case insensitive"));
 			}
@@ -808,7 +808,7 @@ gboolean matcherprop_match(MatcherProp *prop,
 						color, prop->value);
 			} else {
 				log_print(LOG_DEBUG_FILTERING,
-						"message color value [ %d ] doesn't matches color value [ %d ]\n",
+						"message color value [ %d ] does NOT match color value [ %d ]\n",
 						color, prop->value);
 			}
 		}
@@ -828,7 +828,7 @@ gboolean matcherprop_match(MatcherProp *prop,
 						color, prop->value);
 			} else {
 				log_print(LOG_DEBUG_FILTERING,
-						"message color value [ %d ] doesn't matches color value [ %d ]\n",
+						"message color value [ %d ] does NOT match color value [ %d ]\n",
 						color, prop->value);
 			}
 		}