2006-06-06 [paul] 2.2.1cvs5
authorPaul Mangan <paul@claws-mail.org>
Tue, 6 Jun 2006 07:42:50 +0000 (07:42 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 6 Jun 2006 07:42:50 +0000 (07:42 +0000)
* src/matcher.c
fix age_greater and age_lower so that they
mean what say and not '...or equal to'
Thanks to Colin

ChangeLog
PATCHSETS
configure.ac
src/matcher.c

index 2b5662c..8497fce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-06 [paul]      2.2.1cvs5
+
+       * src/matcher.c
+               fix age_greater and age_lower so that they
+               mean what say and not '...or equal to'
+               Thanks to Colin
+
 2006-06-06 [paul]      2.2.1cvs4
 
        * src/textview.c
index 0db51ed..0dda294 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.52.2.19 -r 1.52.2.20 src/prefs_folder_item.c;  cvs diff -u -r 1.207.2.100 -r 1.207.2.101 src/folderview.c;  cvs diff -u -r 1.75.2.23 -r 1.75.2.24 src/matcher.c;  ) > 2.2.1cvs2.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/fr/account.xml;  ) > 2.2.1cvs3.patchset
 ( cvs diff -u -r 1.96.2.114 -r 1.96.2.115 src/textview.c;  cvs diff -u -r 1.36.2.63 -r 1.36.2.64 src/common/utils.c;  ) > 2.2.1cvs4.patchset
+( cvs diff -u -r 1.75.2.24 -r 1.75.2.25 src/matcher.c;  ) > 2.2.1cvs5.patchset
index 7ea0f9a..0a14a8c 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=4
+EXTRA_VERSION=5
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 96fc0ee..5fdfd86 100644 (file)
@@ -579,14 +579,14 @@ gboolean matcherprop_match(MatcherProp *prop,
                || matcherprop_string_match(prop, info->cc));
        case MATCHCRITERIA_AGE_GREATER:
                t = time(NULL);
-               return ((t - info->date_t) / (60 * 60 * 24)) >= prop->value;
+               return ((t - info->date_t) / (60 * 60 * 24)) > prop->value;
        case MATCHCRITERIA_AGE_LOWER:
                t = time(NULL);
-               return ((t - info->date_t) / (60 * 60 * 24)) <= prop->value;
+               return ((t - info->date_t) / (60 * 60 * 24)) < prop->value;
        case MATCHCRITERIA_SCORE_GREATER:
-               return info->score >= prop->value;
+               return info->score > prop->value;
        case MATCHCRITERIA_SCORE_LOWER:
-               return info->score <= prop->value;
+               return info->score < prop->value;
        case MATCHCRITERIA_SCORE_EQUAL:
                return info->score == prop->value;
        case MATCHCRITERIA_SIZE_GREATER: