From 1661b861a349092d403a3e5283e636f41ef98ec4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ho=C3=A0=20Vi=C3=AAt=20Dinh?= Date: Wed, 16 Jan 2002 22:25:21 +0000 Subject: [PATCH] fix a bug about filtering and bounce, be careful, filtering or bouncing action can not be yet used if external editor is automatically launched --- ChangeLog.claws | 8 ++++++++ src/matcher_parser_parse.y | 6 +++--- src/prefs_filtering.c | 6 ++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog.claws b/ChangeLog.claws index a6ee6389a..3fb0afee1 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,11 @@ +2001-12-08 [hoa] 0.7.0claws10 + + * src/matcher_parser_parse.y + fixed some bugs + + * src/prefs_filtering.c + now, we can use bounce action in the dialog box. + 2002-01-16 [carsten] 0.7.0claws9 * src/gtkstext.c removed the and shortcuts because they're diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y index 55ac707c8..685bbd97b 100644 --- a/src/matcher_parser_parse.y +++ b/src/matcher_parser_parse.y @@ -769,7 +769,7 @@ MATCHER_EXECUTE MATCHER_STRING gint account_id = 0; action_type = MATCHACTION_FORWARD; - account_id = $2; + account_id = atoi($2); destination = $3; action = filteringaction_new(action_type, account_id, destination, 0); } @@ -780,7 +780,7 @@ MATCHER_EXECUTE MATCHER_STRING gint account_id = 0; action_type = MATCHACTION_FORWARD_AS_ATTACHMENT; - account_id = $2; + account_id = atoi($2); destination = $3; action = filteringaction_new(action_type, account_id, destination, 0); } @@ -791,7 +791,7 @@ MATCHER_EXECUTE MATCHER_STRING gint account_id = 0; action_type = MATCHACTION_BOUNCE; - account_id = $2; + account_id = atoi($2); destination = $3; action = filteringaction_new(action_type, account_id, destination, 0); } diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c index 055b4572e..f50407cc0 100644 --- a/src/prefs_filtering.c +++ b/src/prefs_filtering.c @@ -203,6 +203,8 @@ static gint prefs_filtering_get_matching_from_action(gint action_id) return MATCHACTION_FORWARD; case ACTION_FORWARD_AS_ATTACHMENT: return MATCHACTION_FORWARD_AS_ATTACHMENT; + case ACTION_BOUNCE: + return MATCHACTION_BOUNCE; case ACTION_EXECUTE: return MATCHACTION_EXECUTE; case ACTION_COLOR: @@ -939,9 +941,9 @@ static void prefs_filtering_select_set(FilteringProp * prop) ACTION_MARK_AS_UNREAD); break; case MATCHACTION_FORWARD: + list_id = get_list_id_from_account_id(action->account_id); gtk_list_select_item(GTK_LIST(filtering.action_list), ACTION_FORWARD); - list_id = get_list_id_from_account_id(action->account_id); gtk_list_select_item(GTK_LIST(filtering.account_list), list_id); break; @@ -953,9 +955,9 @@ static void prefs_filtering_select_set(FilteringProp * prop) list_id); break; case MATCHACTION_BOUNCE: + list_id = get_list_id_from_account_id(action->account_id); gtk_list_select_item(GTK_LIST(filtering.action_list), ACTION_BOUNCE); - list_id = get_list_id_from_account_id(action->account_id); gtk_list_select_item(GTK_LIST(filtering.account_list), list_id); break; -- 2.25.1