2007-07-27 [paul] 2.10.0cvs77

	* src/matcher_parser_parse.y
	* src/prefs_filtering_action.c
	* src/prefs_matcher.c
		these changes forgotten in cvs74's
		'watch thread' feature

diff --git a/ChangeLog b/ChangeLog
index 96a63a54281b0f24f842d0d53a52f4e69f066762..eec3a500d51984ff51cd6b6da2de84810d51bdb1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-27 [paul]      2.10.0cvs77
+
+       * src/matcher_parser_parse.y
+       * src/prefs_filtering_action.c
+       * src/prefs_matcher.c
+               these changes forgotten in cvs74's
+               'watch thread' feature
+

 2007-07-27 [paul]      2.10.0cvs76
 
        * src/compose.c
 2007-07-27 [paul]      2.10.0cvs76
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 828b5e7732243b6c115fa1dc7b5177e8035443b6..9cf24069588ac7f76059f6be87b3e2b9b79bebda 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2730,3 +2730,4 @@
 ( cvs diff -u -r 1.155.2.72 -r 1.155.2.73 src/Makefile.am;  cvs diff -u -r 1.60.2.35 -r 1.60.2.36 src/filtering.c;  cvs diff -u -r 1.213.2.151 -r 1.213.2.152 src/folder.c;  cvs diff -u -r 1.274.2.202 -r 1.274.2.203 src/mainwindow.c;  cvs diff -u -r 1.75.2.44 -r 1.75.2.45 src/matcher.c;  cvs diff -u -r 1.39.2.14 -r 1.39.2.15 src/matcher.h;  cvs diff -u -r 1.25.2.30 -r 1.25.2.31 src/matcher_parser_parse.y;  cvs diff -u -r 1.150.2.100 -r 1.150.2.101 src/procmsg.c;  cvs diff -u -r 1.60.2.46 -r 1.60.2.47 src/procmsg.h;  cvs diff -u -r 1.25.2.44 -r 1.25.2.45 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.30 -r 1.18.2.31 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.316 -r 1.395.2.317 src/summaryview.c;  cvs diff -u -r 1.68.2.39 -r 1.68.2.40 src/summaryview.h;  cvs diff -u -r 1.43.2.79 -r 1.43.2.80 src/toolbar.c;  cvs diff -u -r 1.19.2.21 -r 1.19.2.22 src/toolbar.h;  diff -u /dev/null src/pixmaps/watchthread.xpm;  ) > 2.10.0cvs74.patchset
 ( cvs diff -u -r 1.274.2.203 -r 1.274.2.204 src/mainwindow.c;  cvs diff -u -r 1.11.2.12 -r 1.11.2.13 src/manual.c;  cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/manual.h;  cvs diff -u -r 1.5.2.61 -r 1.5.2.62 src/gtk/gtkutils.c;  ) > 2.10.0cvs75.patchset
 ( cvs diff -u -r 1.382.2.396 -r 1.382.2.397 src/compose.c;  ) > 2.10.0cvs76.patchset
 ( cvs diff -u -r 1.155.2.72 -r 1.155.2.73 src/Makefile.am;  cvs diff -u -r 1.60.2.35 -r 1.60.2.36 src/filtering.c;  cvs diff -u -r 1.213.2.151 -r 1.213.2.152 src/folder.c;  cvs diff -u -r 1.274.2.202 -r 1.274.2.203 src/mainwindow.c;  cvs diff -u -r 1.75.2.44 -r 1.75.2.45 src/matcher.c;  cvs diff -u -r 1.39.2.14 -r 1.39.2.15 src/matcher.h;  cvs diff -u -r 1.25.2.30 -r 1.25.2.31 src/matcher_parser_parse.y;  cvs diff -u -r 1.150.2.100 -r 1.150.2.101 src/procmsg.c;  cvs diff -u -r 1.60.2.46 -r 1.60.2.47 src/procmsg.h;  cvs diff -u -r 1.25.2.44 -r 1.25.2.45 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.30 -r 1.18.2.31 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.316 -r 1.395.2.317 src/summaryview.c;  cvs diff -u -r 1.68.2.39 -r 1.68.2.40 src/summaryview.h;  cvs diff -u -r 1.43.2.79 -r 1.43.2.80 src/toolbar.c;  cvs diff -u -r 1.19.2.21 -r 1.19.2.22 src/toolbar.h;  diff -u /dev/null src/pixmaps/watchthread.xpm;  ) > 2.10.0cvs74.patchset
 ( cvs diff -u -r 1.274.2.203 -r 1.274.2.204 src/mainwindow.c;  cvs diff -u -r 1.11.2.12 -r 1.11.2.13 src/manual.c;  cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/manual.h;  cvs diff -u -r 1.5.2.61 -r 1.5.2.62 src/gtk/gtkutils.c;  ) > 2.10.0cvs75.patchset
 ( cvs diff -u -r 1.382.2.396 -r 1.382.2.397 src/compose.c;  ) > 2.10.0cvs76.patchset

+( cvs diff -u -r 1.25.2.31 -r 1.25.2.32 src/matcher_parser_parse.y;  cvs diff -u -r 1.1.4.38 -r 1.1.4.39 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.59 -r 1.43.2.60 src/prefs_matcher.c;  ) > 2.10.0cvs77.patchset

diff --git a/configure.ac b/configure.ac
index e298e47eba166d14c5e6271bbe16362f4681a8d2..a4788bc0d6f5ba481d039c34bfb08bfc64ff2d74 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=76
+EXTRA_VERSION=77

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y
index c06bcdd175bad9075c865b004469f3242e48787e..0f3216ae4dfadc547a9da3cce8032b0b70796b32 100644 (file)
--- a/src/matcher_parser_parse.y
+++ b/src/matcher_parser_parse.y
@@ -1340,6 +1340,10 @@ MATCHER_EXECUTE MATCHER_STRING
 {
        action = filteringaction_new(MATCHACTION_IGNORE, 0, NULL, 0, 0, NULL);
 }
 {
        action = filteringaction_new(MATCHACTION_IGNORE, 0, NULL, 0, 0, NULL);
 }

+| MATCHER_WATCH
+{
+       action = filteringaction_new(MATCHACTION_WATCH, 0, NULL, 0, 0, NULL);
+}

 | MATCHER_ADD_TO_ADDRESSBOOK MATCHER_STRING
 {
        header = g_strdup($2);
 | MATCHER_ADD_TO_ADDRESSBOOK MATCHER_STRING
 {
        header = g_strdup($2);

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index 3d5b0ac27660f800245fa699186594ad9a8c2e4d..a54faa21c8cc4f8e22f6019b45a7fd5c65b94967 100644 (file)
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -153,6 +153,7 @@ typedef enum Action_ {
        ACTION_CLEAR_TAGS,
        ACTION_HIDE,
        ACTION_IGNORE,
        ACTION_CLEAR_TAGS,
        ACTION_HIDE,
        ACTION_IGNORE,

+       ACTION_WATCH,

        ACTION_ADD_TO_ADDRESSBOOK,
        ACTION_STOP,
        /* add other action constants */
        ACTION_ADD_TO_ADDRESSBOOK,
        ACTION_STOP,
        /* add other action constants */


@@ -185,6 +186,7 @@ static struct {
        { N_("Clear tags"),             ACTION_CLEAR_TAGS},
        { N_("Hide"),                   ACTION_HIDE     },
        { N_("Ignore thread"),          ACTION_IGNORE   },
        { N_("Clear tags"),             ACTION_CLEAR_TAGS},
        { N_("Hide"),                   ACTION_HIDE     },
        { N_("Ignore thread"),          ACTION_IGNORE   },

+       { N_("Watch thread"),           ACTION_WATCH    },

        { N_("Add to address book"),    ACTION_ADD_TO_ADDRESSBOOK       },
        { N_("Stop filter"),            ACTION_STOP     },
 };
        { N_("Add to address book"),    ACTION_ADD_TO_ADDRESSBOOK       },
        { N_("Stop filter"),            ACTION_STOP     },
 };


@@ -859,6 +861,8 @@ static gint prefs_filtering_action_get_matching_from_action(Action action_id)
                return MATCHACTION_HIDE;
        case ACTION_IGNORE:
                return MATCHACTION_IGNORE;
                return MATCHACTION_HIDE;
        case ACTION_IGNORE:
                return MATCHACTION_IGNORE;

+       case ACTION_WATCH:
+               return MATCHACTION_WATCH;

        case ACTION_STOP:
                return MATCHACTION_STOP;
        case ACTION_CHANGE_SCORE:
        case ACTION_STOP:
                return MATCHACTION_STOP;
        case ACTION_CHANGE_SCORE:


@@ -970,6 +974,7 @@ static FilteringAction * prefs_filtering_action_dialog_to_action(gboolean alert)
        case ACTION_STOP:
        case ACTION_HIDE:
        case ACTION_IGNORE:
        case ACTION_STOP:
        case ACTION_HIDE:
        case ACTION_IGNORE:

+       case ACTION_WATCH:

         case ACTION_DELETE:
         case ACTION_MARK:
         case ACTION_UNMARK:
         case ACTION_DELETE:
         case ACTION_MARK:
         case ACTION_UNMARK:


@@ -1416,6 +1421,7 @@ static void prefs_filtering_action_type_select(GtkList *list,
         case ACTION_STOP:
         case ACTION_HIDE:
        case ACTION_IGNORE:
         case ACTION_STOP:
         case ACTION_HIDE:
        case ACTION_IGNORE:

+       case ACTION_WATCH:

        case ACTION_CLEAR_TAGS:
                gtk_widget_show(filtering_action.account_label);
                gtk_widget_set_sensitive(filtering_action.account_label, FALSE);
        case ACTION_CLEAR_TAGS:
                gtk_widget_show(filtering_action.account_label);
                gtk_widget_set_sensitive(filtering_action.account_label, FALSE);


@@ -1894,6 +1900,10 @@ static gboolean prefs_filtering_actions_selected
                gtk_list_select_item(GTK_LIST(filtering_action.action_type_list),
                                     ACTION_IGNORE);
                break;
                gtk_list_select_item(GTK_LIST(filtering_action.action_type_list),
                                     ACTION_IGNORE);
                break;

+       case MATCHACTION_WATCH:
+               gtk_list_select_item(GTK_LIST(filtering_action.action_type_list),
+                                    ACTION_WATCH);
+               break;

        case MATCHACTION_ADD_TO_ADDRESSBOOK:
                if (action->header)
                        gtk_entry_set_text(GTK_ENTRY(filtering_action.header_entry), action->header);
        case MATCHACTION_ADD_TO_ADDRESSBOOK:
                if (action->header)
                        gtk_entry_set_text(GTK_ENTRY(filtering_action.header_entry), action->header);

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 9683edb4fed772a79db05ea52771b98e679ccf1a..4032595d7f16fdb855db67d3e6a90d5b353f3bf9 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -136,23 +136,24 @@ enum {
        CRITERIA_SPAM = 22,
        CRITERIA_COLORLABEL = 23,
        CRITERIA_IGNORE_THREAD = 24,
        CRITERIA_SPAM = 22,
        CRITERIA_COLORLABEL = 23,
        CRITERIA_IGNORE_THREAD = 24,

+       CRITERIA_WATCH_THREAD = 25,

 
 

-       CRITERIA_SCORE_GREATER = 25,
-       CRITERIA_SCORE_LOWER = 26,
-       CRITERIA_SCORE_EQUAL = 27,
+       CRITERIA_SCORE_GREATER = 26,
+       CRITERIA_SCORE_LOWER = 27,
+       CRITERIA_SCORE_EQUAL = 28,

 
 

-       CRITERIA_TEST = 28,
+       CRITERIA_TEST = 29,

 
 

-       CRITERIA_SIZE_GREATER = 29,
-       CRITERIA_SIZE_SMALLER = 30,
-       CRITERIA_SIZE_EQUAL   = 31,
+       CRITERIA_SIZE_GREATER = 30,
+       CRITERIA_SIZE_SMALLER = 31,
+       CRITERIA_SIZE_EQUAL   = 32,

        
        

-       CRITERIA_PARTIAL = 32,
+       CRITERIA_PARTIAL = 33,

 
 

-       CRITERIA_FOUND_IN_ADDRESSBOOK = 33,
+       CRITERIA_FOUND_IN_ADDRESSBOOK = 34,

        
        

-       CRITERIA_TAG = 34,
-       CRITERIA_TAGGED = 35
+       CRITERIA_TAG = 35,
+       CRITERIA_TAGGED = 36

 };
 
 /*!
 };
 
 /*!


@@ -193,6 +194,7 @@ static struct_criteria_text criteria_text [] = {
        { N_("Spam flag"), FALSE },
        { N_("Color label"), FALSE },
        { N_("Ignored thread"), FALSE },
        { N_("Spam flag"), FALSE },
        { N_("Color label"), FALSE },
        { N_("Ignored thread"), FALSE },

+       { N_("Watched thread"), FALSE },

        { N_("Score greater than"), FALSE },
        { N_("Score lower than"), FALSE },
        { N_("Score equal to"), FALSE },
        { N_("Score greater than"), FALSE },
        { N_("Score lower than"), FALSE },
        { N_("Score equal to"), FALSE },


@@ -1001,6 +1003,9 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
        case MATCHCRITERIA_IGNORE_THREAD:
        case MATCHCRITERIA_NOT_IGNORE_THREAD:
                return CRITERIA_IGNORE_THREAD;
        case MATCHCRITERIA_IGNORE_THREAD:
        case MATCHCRITERIA_NOT_IGNORE_THREAD:
                return CRITERIA_IGNORE_THREAD;

+       case MATCHCRITERIA_WATCH_THREAD:
+       case MATCHCRITERIA_NOT_WATCH_THREAD:
+               return CRITERIA_WATCH_THREAD;

        case MATCHCRITERIA_NOT_SUBJECT:
        case MATCHCRITERIA_SUBJECT:
                return CRITERIA_SUBJECT;
        case MATCHCRITERIA_NOT_SUBJECT:
        case MATCHCRITERIA_SUBJECT:
                return CRITERIA_SUBJECT;


@@ -1105,6 +1110,8 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
                return MATCHCRITERIA_COLORLABEL;
        case CRITERIA_IGNORE_THREAD:
                return MATCHCRITERIA_IGNORE_THREAD;
                return MATCHCRITERIA_COLORLABEL;
        case CRITERIA_IGNORE_THREAD:
                return MATCHCRITERIA_IGNORE_THREAD;

+       case CRITERIA_WATCH_THREAD:
+               return MATCHCRITERIA_WATCH_THREAD;

        case CRITERIA_SUBJECT:
                return MATCHCRITERIA_SUBJECT;
        case CRITERIA_FROM:
        case CRITERIA_SUBJECT:
                return MATCHCRITERIA_SUBJECT;
        case CRITERIA_FROM:


@@ -1191,6 +1198,8 @@ static gint prefs_matcher_not_criteria(gint matcher_criteria)
                return MATCHCRITERIA_NOT_COLORLABEL;
        case MATCHCRITERIA_IGNORE_THREAD:
                return MATCHCRITERIA_NOT_IGNORE_THREAD;
                return MATCHCRITERIA_NOT_COLORLABEL;
        case MATCHCRITERIA_IGNORE_THREAD:
                return MATCHCRITERIA_NOT_IGNORE_THREAD;

+       case MATCHCRITERIA_WATCH_THREAD:
+               return MATCHCRITERIA_NOT_WATCH_THREAD;

        case MATCHCRITERIA_SUBJECT:
                return MATCHCRITERIA_NOT_SUBJECT;
        case MATCHCRITERIA_FROM:
        case MATCHCRITERIA_SUBJECT:
                return MATCHCRITERIA_NOT_SUBJECT;
        case MATCHCRITERIA_FROM:


@@ -1272,6 +1281,7 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        case CRITERIA_TEST:
        case CRITERIA_COLORLABEL:
        case CRITERIA_IGNORE_THREAD:
        case CRITERIA_TEST:
        case CRITERIA_COLORLABEL:
        case CRITERIA_IGNORE_THREAD:

+       case CRITERIA_WATCH_THREAD:

        case CRITERIA_FOUND_IN_ADDRESSBOOK:
        case CRITERIA_TAGGED:
                if (value_pred_flag == PREDICATE_FLAG_DISABLED)
        case CRITERIA_FOUND_IN_ADDRESSBOOK:
        case CRITERIA_TAGGED:
                if (value_pred_flag == PREDICATE_FLAG_DISABLED)


@@ -1326,6 +1336,7 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        case CRITERIA_SPAM:
        case CRITERIA_PARTIAL:
        case CRITERIA_IGNORE_THREAD:
        case CRITERIA_SPAM:
        case CRITERIA_PARTIAL:
        case CRITERIA_IGNORE_THREAD:

+       case CRITERIA_WATCH_THREAD:

        case CRITERIA_TAGGED:
                break;
 
        case CRITERIA_TAGGED:
                break;
 


@@ -1678,6 +1689,7 @@ static void prefs_matcher_criteria_select(GtkList *list,
        case CRITERIA_SPAM:
        case CRITERIA_PARTIAL:
        case CRITERIA_IGNORE_THREAD:
        case CRITERIA_SPAM:
        case CRITERIA_PARTIAL:
        case CRITERIA_IGNORE_THREAD:

+       case CRITERIA_WATCH_THREAD:

        case CRITERIA_TAGGED:
                prefs_matcher_disable_widget(matcher.header_combo);
                prefs_matcher_disable_widget(matcher.header_label);
        case CRITERIA_TAGGED:
                prefs_matcher_disable_widget(matcher.header_combo);
                prefs_matcher_disable_widget(matcher.header_label);


@@ -2107,6 +2119,7 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
        case MATCHCRITERIA_NOT_PARTIAL:
        case MATCHCRITERIA_NOT_COLORLABEL:
        case MATCHCRITERIA_NOT_IGNORE_THREAD:
        case MATCHCRITERIA_NOT_PARTIAL:
        case MATCHCRITERIA_NOT_COLORLABEL:
        case MATCHCRITERIA_NOT_IGNORE_THREAD:

+       case MATCHCRITERIA_NOT_WATCH_THREAD:

        case MATCHCRITERIA_NOT_SUBJECT:
        case MATCHCRITERIA_NOT_FROM:
        case MATCHCRITERIA_NOT_TO:
        case MATCHCRITERIA_NOT_SUBJECT:
        case MATCHCRITERIA_NOT_FROM:
        case MATCHCRITERIA_NOT_TO: