+2003-09-17 [hoa] 0.9.5claws18
+
+ * changed the keyword used for command execution in condition
+ keyword is changed from "execute" to "test"
+ so that it is not the same as the one used for action.
+ This will fix a bug when using filtering dialog.
+ All semantic in the code is also changed to reflect
+ the keyword change.
+
2003-09-17 [paul]
* sync with 0.9.6 release
[hoa]
o work on sylpheed :)
- o several actions on filtering condition
o separate code of compose dialog and building of message
compose should return some kind of MIME structure so that
a message can be built.
- o use libEtPan! in sylpheed
[christoph]
MICRO_VERSION=5
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
if test $EXTRA_VERSION -eq 0; then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
else
{MATCHCRITERIA_NOT_MESSAGE, "~message"},
{MATCHCRITERIA_BODY_PART, "body_part"},
{MATCHCRITERIA_NOT_BODY_PART, "~body_part"},
- {MATCHCRITERIA_EXECUTE, "execute"},
- {MATCHCRITERIA_NOT_EXECUTE, "~execute"},
+ {MATCHCRITERIA_TEST, "test"},
+ {MATCHCRITERIA_NOT_TEST, "~test"},
/* match type */
{MATCHTYPE_MATCHCASE, "matchcase"},
*
*\return gboolean TRUE if command was executed succesfully
*/
-static gboolean matcherprop_match_execute(const MatcherProp *prop,
+static gboolean matcherprop_match_test(const MatcherProp *prop,
MsgInfo *info)
{
gchar *file;
return matcherprop_string_match(prop, info->references);
case MATCHCRITERIA_NOT_REFERENCES:
return !matcherprop_string_match(prop, info->references);
- case MATCHCRITERIA_EXECUTE:
- return matcherprop_match_execute(prop, info);
- case MATCHCRITERIA_NOT_EXECUTE:
- return !matcherprop_match_execute(prop, info);
+ case MATCHCRITERIA_TEST:
+ return matcherprop_match_test(prop, info);
+ case MATCHCRITERIA_NOT_TEST:
+ return !matcherprop_match_test(prop, info);
default:
return 0;
}
case MATCHCRITERIA_SIZE_GREATER:
case MATCHCRITERIA_SIZE_SMALLER:
case MATCHCRITERIA_SIZE_EQUAL:
- case MATCHCRITERIA_EXECUTE:
- case MATCHCRITERIA_NOT_EXECUTE:
+ case MATCHCRITERIA_TEST:
+ case MATCHCRITERIA_NOT_TEST:
if (matcherprop_match(matcher, info)) {
if (!matchers->bool_and) {
return TRUE;
case MATCHCRITERIA_IGNORE_THREAD:
case MATCHCRITERIA_NOT_IGNORE_THREAD:
return g_strdup(criteria_str);
- case MATCHCRITERIA_EXECUTE:
- case MATCHCRITERIA_NOT_EXECUTE:
+ case MATCHCRITERIA_TEST:
+ case MATCHCRITERIA_NOT_TEST:
expr = matcher_escape_str(matcher->expr);
matcher_str = g_strdup_printf("%s \"%s\"", criteria_str, expr);
g_free((gpointer) expr);
MC_(HEADERS_PART), MC_(NOT_HEADERS_PART),
MC_(MESSAGE), MC_(NOT_MESSAGE),
MC_(BODY_PART), MC_(NOT_BODY_PART),
- MC_(EXECUTE), MC_(NOT_EXECUTE),
+ MC_(TEST), MC_(NOT_TEST),
MC_(SCORE_EQUAL),
MC_(SIZE_GREATER),
MC_(SIZE_SMALLER),
%token MATCHER_SCORE_LOWER MATCHER_HEADER MATCHER_NOT_HEADER
%token MATCHER_HEADERS_PART MATCHER_NOT_HEADERS_PART MATCHER_MESSAGE
%token MATCHER_NOT_MESSAGE MATCHER_BODY_PART MATCHER_NOT_BODY_PART
-%token MATCHER_EXECUTE MATCHER_NOT_EXECUTE MATCHER_MATCHCASE MATCHER_MATCH
+%token MATCHER_TEST MATCHER_NOT_TEST MATCHER_MATCHCASE MATCHER_MATCH
%token MATCHER_REGEXPCASE MATCHER_REGEXP MATCHER_SCORE MATCHER_MOVE
%token MATCHER_COPY MATCHER_DELETE MATCHER_MARK MATCHER_UNMARK MATCHER_LOCK MATCHER_UNLOCK
+%token MATCHER_EXECUTE
%token MATCHER_MARK_AS_READ MATCHER_MARK_AS_UNREAD MATCHER_FORWARD
%token MATCHER_FORWARD_AS_ATTACHMENT MATCHER_EOL MATCHER_STRING
%token MATCHER_OR MATCHER_AND
expr = $3;
prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
}
-| MATCHER_EXECUTE MATCHER_STRING
+| MATCHER_TEST MATCHER_STRING
{
gint criteria = 0;
gchar *expr = NULL;
- criteria = MATCHCRITERIA_EXECUTE;
+ criteria = MATCHCRITERIA_TEST;
expr = $2;
prop = matcherprop_unquote_new(criteria, NULL, 0, expr, 0);
}
-| MATCHER_NOT_EXECUTE MATCHER_STRING
+| MATCHER_NOT_TEST MATCHER_STRING
{
gint criteria = 0;
gchar *expr = NULL;
- criteria = MATCHCRITERIA_NOT_EXECUTE;
+ criteria = MATCHCRITERIA_NOT_TEST;
expr = $2;
prop = matcherprop_unquote_new(criteria, NULL, 0, expr, 0);
}
CRITERIA_SCORE_LOWER = 25,
CRITERIA_SCORE_EQUAL = 26,
- CRITERIA_EXECUTE = 27,
+ CRITERIA_TEST = 27,
CRITERIA_SIZE_GREATER = 28,
CRITERIA_SIZE_SMALLER = 29,
return CRITERIA_SCORE_LOWER;
case MATCHCRITERIA_SCORE_EQUAL:
return CRITERIA_SCORE_EQUAL;
- case MATCHCRITERIA_NOT_EXECUTE:
- case MATCHCRITERIA_EXECUTE:
- return CRITERIA_EXECUTE;
+ case MATCHCRITERIA_NOT_TEST:
+ case MATCHCRITERIA_TEST:
+ return CRITERIA_TEST;
case MATCHCRITERIA_SIZE_GREATER:
return CRITERIA_SIZE_GREATER;
case MATCHCRITERIA_SIZE_SMALLER:
return MATCHCRITERIA_BODY_PART;
case CRITERIA_MESSAGE:
return MATCHCRITERIA_MESSAGE;
- case CRITERIA_EXECUTE:
- return MATCHCRITERIA_EXECUTE;
+ case CRITERIA_TEST:
+ return MATCHCRITERIA_TEST;
case CRITERIA_SIZE_GREATER:
return MATCHCRITERIA_SIZE_GREATER;
case CRITERIA_SIZE_SMALLER:
return MATCHCRITERIA_NOT_HEADERS_PART;
case MATCHCRITERIA_MESSAGE:
return MATCHCRITERIA_NOT_MESSAGE;
- case MATCHCRITERIA_EXECUTE:
- return MATCHCRITERIA_NOT_EXECUTE;
+ case MATCHCRITERIA_TEST:
+ return MATCHCRITERIA_NOT_TEST;
case MATCHCRITERIA_BODY_PART:
return MATCHCRITERIA_NOT_BODY_PART;
default:
case CRITERIA_REPLIED:
case CRITERIA_FORWARDED:
case CRITERIA_LOCKED:
- case CRITERIA_EXECUTE:
+ case CRITERIA_TEST:
case CRITERIA_COLORLABEL:
case CRITERIA_IGNORE_THREAD:
if (value_pred_flag == PREDICATE_FLAG_DISABLED)
case CRITERIA_HEADERS_PART:
case CRITERIA_BODY_PART:
case CRITERIA_MESSAGE:
- case CRITERIA_EXECUTE:
+ case CRITERIA_TEST:
expr = gtk_entry_get_text(GTK_ENTRY(matcher.value_entry));
break;
case MATCHCRITERIA_HEADERS_PART:
case MATCHCRITERIA_BODY_PART:
case MATCHCRITERIA_MESSAGE:
- case MATCHCRITERIA_EXECUTE:
+ case MATCHCRITERIA_TEST:
gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), prop->expr);
break;
gtk_widget_set_sensitive(matcher.exec_btn, FALSE);
break;
- case CRITERIA_EXECUTE:
+ case CRITERIA_TEST:
gtk_widget_set_sensitive(matcher.header_combo, FALSE);
gtk_widget_set_sensitive(matcher.header_label, FALSE);
gtk_widget_set_sensitive(matcher.value_label, TRUE);