projects / claws.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 160792b)
add 'score equal to' option
authorPaul Mangan <paul@claws-mail.org>
Tue, 18 Sep 2001 11:02:34 +0000 (11:02 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 18 Sep 2001 11:02:34 +0000 (11:02 +0000)
AUTHORS patch | blob | history
ChangeLog.claws patch | blob | history
src/matcher.c patch | blob | history
src/matcher.h patch | blob | history
src/prefs_matcher.c patch | blob | history

diff --git a/AUTHORS b/AUTHORS
index 4873150e10bd21e5d5b448b01e4f24f4c9bb3685..b516e9b7d52da3c0f03479dc37bc3f841c89e27c 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,6 +7,7 @@ claws-branch (http://sylpheed-claws.sourceforge.net)
 
        Hoa viet Dinh           <dinh.viet.hoa@free.fr>
        Match Grun              <match@dimensional.com>
 
        Hoa viet Dinh           <dinh.viet.hoa@free.fr>
        Match Grun              <match@dimensional.com>
+       Melvin Hadasht          <melvin.hadasht@free.fr>
        Christoph Hohmann       <reboot@gmx.ch>
        Alfons Hoogervorst      <alfons@proteus.demon.nl>
        Darko Koruga            <darko.koruga@hermes.si>
        Christoph Hohmann       <reboot@gmx.ch>
        Alfons Hoogervorst      <alfons@proteus.demon.nl>
        Darko Koruga            <darko.koruga@hermes.si>
@@ -79,4 +80,4 @@ contributors (beside the above; based on Changelog)
        Don Quijote
        David Looney
        Eric Limpens
        Don Quijote
        David Looney
        Eric Limpens
-       Melvin Hadasht
+       Paul Evans
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 4e1f55f2fe7a8593a5fd680e391a9fdeb7e41160..64a4aeae0655915e9ff606e66bfe5ff689b53db6 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -2,7 +2,12 @@
 
        * configure.in
                change to version 0.6.2claws1
 
        * configure.in
                change to version 0.6.2claws1
-       * sync with sylpheed 0.6.2cvs1 
+       * sync with sylpheed 0.6.2cvs1
+
+       * src/matcher.c 
+       * src/prefs_matcher.c
+               add 'score equal to' option, submitted by
+               Paul Evans <nerd@freeuk.com>
 
 2001-09-15 [christoph]
 
 
 2001-09-15 [christoph]
 
diff --git a/src/matcher.c b/src/matcher.c
index 9a671c52aedc520fe83cff7865b846e9d8a3a492..fdcd37935601a7fc032bf09d78bd7230f4eaa6cc 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -79,6 +79,7 @@ static MatchParser matchparser_tab[] = {
        {MATCHING_NOT_REFERENCES, "~references"},
        {MATCHING_SCORE_GREATER, "score_greater"},
        {MATCHING_SCORE_LOWER, "score_lower"},
        {MATCHING_NOT_REFERENCES, "~references"},
        {MATCHING_SCORE_GREATER, "score_greater"},
        {MATCHING_SCORE_LOWER, "score_lower"},
+       {MATCHING_SCORE_EQUAL, "score_equal"},
 
        /* content have to be read */
        {MATCHING_HEADER, "header"},
 
        /* content have to be read */
        {MATCHING_HEADER, "header"},
@@ -170,6 +171,7 @@ MatcherProp * matcherprop_parse(gchar ** str)
        case MATCHING_AGE_GREATER:
        case MATCHING_SCORE_LOWER:
        case MATCHING_SCORE_GREATER:
        case MATCHING_AGE_GREATER:
        case MATCHING_SCORE_LOWER:
        case MATCHING_SCORE_GREATER:
+       case MATCHING_SCORE_EQUAL:
                value = matcher_parse_number(&tmp);
                if (tmp == NULL) {
                        * str = NULL;
                value = matcher_parse_number(&tmp);
                if (tmp == NULL) {
                        * str = NULL;
@@ -646,6 +648,8 @@ gboolean matcherprop_match(MatcherProp * prop, MsgInfo * info)
                return info->score >= prop->value;
        case MATCHING_SCORE_LOWER:
                return info->score <= prop->value;
                return info->score >= prop->value;
        case MATCHING_SCORE_LOWER:
                return info->score <= prop->value;
+       case MATCHING_SCORE_EQUAL:
+               return info->score == prop->value;
        case MATCHING_NEWSGROUPS:
                return matcherprop_string_match(prop, info->newsgroups);
        case MATCHING_NOT_NEWSGROUPS:
        case MATCHING_NEWSGROUPS:
                return matcherprop_string_match(prop, info->newsgroups);
        case MATCHING_NOT_NEWSGROUPS:
@@ -1088,6 +1092,7 @@ gboolean matcherlist_match(MatcherList * matchers, MsgInfo * info)
                case MATCHING_NOT_REFERENCES:
                case MATCHING_SCORE_GREATER:
                case MATCHING_SCORE_LOWER:
                case MATCHING_NOT_REFERENCES:
                case MATCHING_SCORE_GREATER:
                case MATCHING_SCORE_LOWER:
+               case MATCHING_SCORE_EQUAL:
                case MATCHING_EXECUTE:
                case MATCHING_NOT_EXECUTE:
                        if (matcherprop_match(matcher, info)) {
                case MATCHING_EXECUTE:
                case MATCHING_NOT_EXECUTE:
                        if (matcherprop_match(matcher, info)) {
@@ -1183,6 +1188,7 @@ gchar * matcherprop_to_string(MatcherProp * matcher)
        case MATCHING_AGE_LOWER:
        case MATCHING_SCORE_GREATER:
        case MATCHING_SCORE_LOWER:
        case MATCHING_AGE_LOWER:
        case MATCHING_SCORE_GREATER:
        case MATCHING_SCORE_LOWER:
+       case MATCHING_SCORE_EQUAL:
                return g_strdup_printf("%s %i", criteria_str, matcher->value);
                break;
        case MATCHING_ALL:
                return g_strdup_printf("%s %i", criteria_str, matcher->value);
                break;
        case MATCHING_ALL:
diff --git a/src/matcher.h b/src/matcher.h
index 54d253e210246743825324cca7cbb072253c2f87..1bae409620a649a210c3e956910fd286c122a609 100644 (file)
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -44,6 +44,7 @@ enum {
        MATCHING_NOT_REFERENCES,
        MATCHING_SCORE_GREATER,
        MATCHING_SCORE_LOWER,
        MATCHING_NOT_REFERENCES,
        MATCHING_SCORE_GREATER,
        MATCHING_SCORE_LOWER,
+       MATCHING_SCORE_EQUAL,
 
        /* file content */
        MATCHING_HEADER,
 
        /* file content */
        MATCHING_HEADER,
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 9cdb370daffe242490caad934f2f27d78250820e..c231b1e6c573e3822554ebb4070d93444603f133 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -104,8 +104,9 @@ enum {
 
        CRITERIA_SCORE_GREATER = 21,
        CRITERIA_SCORE_LOWER = 22,
 
        CRITERIA_SCORE_GREATER = 21,
        CRITERIA_SCORE_LOWER = 22,
+       CRITERIA_SCORE_EQUAL = 23,
 
 
-       CRITERIA_EXECUTE = 23
+       CRITERIA_EXECUTE = 24
 };
 
 enum {
 };
 
 enum {
@@ -146,6 +147,7 @@ gchar * criteria_text [] = {
        N_("Marked flag"), N_("Deleted flag"),
        N_("Replied flag"), N_("Forwarded flag"),
        N_("Score greater than"), N_("Score lower than"),
        N_("Marked flag"), N_("Deleted flag"),
        N_("Replied flag"), N_("Forwarded flag"),
        N_("Score greater than"), N_("Score lower than"),
+       N_("Score equal to"),
        N_("Execute")
 };
 
        N_("Execute")
 };
 
@@ -769,6 +771,8 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
                return CRITERIA_SCORE_GREATER;
        case MATCHING_SCORE_LOWER:
                return CRITERIA_SCORE_LOWER;
                return CRITERIA_SCORE_GREATER;
        case MATCHING_SCORE_LOWER:
                return CRITERIA_SCORE_LOWER;
+       case MATCHING_SCORE_EQUAL:
+               return CRITERIA_SCORE_EQUAL;
        case MATCHING_NOT_EXECUTE:
        case MATCHING_EXECUTE:
                return CRITERIA_EXECUTE;
        case MATCHING_NOT_EXECUTE:
        case MATCHING_EXECUTE:
                return CRITERIA_EXECUTE;
@@ -819,6 +823,8 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
                return MATCHING_SCORE_GREATER;
        case CRITERIA_SCORE_LOWER:
                return MATCHING_SCORE_LOWER;
                return MATCHING_SCORE_GREATER;
        case CRITERIA_SCORE_LOWER:
                return MATCHING_SCORE_LOWER;
+       case CRITERIA_SCORE_EQUAL:
+               return MATCHING_SCORE_EQUAL;
        case CRITERIA_HEADER:
                return MATCHING_HEADER;
        case CRITERIA_HEADERS_PART:
        case CRITERIA_HEADER:
                return MATCHING_HEADER;
        case CRITERIA_HEADERS_PART:
@@ -988,6 +994,7 @@ static MatcherProp * prefs_matcher_dialog_to_matcher()
        case CRITERIA_AGE_LOWER:
        case CRITERIA_SCORE_GREATER:
        case CRITERIA_SCORE_LOWER:
        case CRITERIA_AGE_LOWER:
        case CRITERIA_SCORE_GREATER:
        case CRITERIA_SCORE_LOWER:
+       case CRITERIA_SCORE_EQUAL:
                value_str = gtk_entry_get_text(GTK_ENTRY(matcher.value_entry));
 
                if (*value_str == '\0') {
                value_str = gtk_entry_get_text(GTK_ENTRY(matcher.value_entry));
 
                if (*value_str == '\0') {
@@ -1195,6 +1202,7 @@ static void prefs_matcher_select(GtkCList *clist, gint row, gint column,
        case MATCHING_AGE_LOWER:
        case MATCHING_SCORE_GREATER:
        case MATCHING_SCORE_LOWER:
        case MATCHING_AGE_LOWER:
        case MATCHING_SCORE_GREATER:
        case MATCHING_SCORE_LOWER:
+       case MATCHING_SCORE_EQUAL:
                gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), itos(prop->value));
                break;
 
                gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), itos(prop->value));
                break;
 
@@ -1321,6 +1329,7 @@ static void prefs_matcher_criteria_select(GtkList *list,
        case CRITERIA_AGE_LOWER:
        case CRITERIA_SCORE_GREATER:
        case CRITERIA_SCORE_LOWER:
        case CRITERIA_AGE_LOWER:
        case CRITERIA_SCORE_GREATER:
        case CRITERIA_SCORE_LOWER:
+       case CRITERIA_SCORE_EQUAL:
                gtk_widget_set_sensitive(matcher.header_combo, FALSE);
                gtk_widget_set_sensitive(matcher.header_label, FALSE);
                gtk_widget_set_sensitive(matcher.value_label, TRUE);
                gtk_widget_set_sensitive(matcher.header_combo, FALSE);
                gtk_widget_set_sensitive(matcher.header_label, FALSE);
                gtk_widget_set_sensitive(matcher.value_label, TRUE);
Claws Mail