val = GPOINTER_TO_INT(g_hash_table_lookup
(folder_table, dest_folder));
if (val == 0) {
- folder_item_scan(dest_folder);
g_hash_table_insert(folder_table, dest_folder,
GINT_TO_POINTER(1));
}
val = GPOINTER_TO_INT(g_hash_table_lookup
(folder_table, dest_folder));
if (val == 0) {
- folder_item_scan(dest_folder);
g_hash_table_insert(folder_table, dest_folder,
GINT_TO_POINTER(1));
}
return TRUE;
case MATCHACTION_MARK:
- MSG_SET_PERM_FLAGS(info->flags, MSG_MARKED);
+ procmsg_msginfo_set_flags(info, MSG_MARKED, 0);
return TRUE;
case MATCHACTION_UNMARK:
- MSG_UNSET_PERM_FLAGS(info->flags, MSG_MARKED);
+ procmsg_msginfo_unset_flags(info, MSG_MARKED, 0);
return TRUE;
case MATCHACTION_MARK_AS_READ:
- MSG_UNSET_PERM_FLAGS(info->flags, MSG_UNREAD | MSG_NEW);
+ procmsg_msginfo_unset_flags(info, MSG_UNREAD | MSG_NEW, 0);
return TRUE;
case MATCHACTION_MARK_AS_UNREAD:
- MSG_SET_PERM_FLAGS(info->flags, MSG_UNREAD | MSG_NEW);
+ debug_print("*** setting unread flags\n");
+ procmsg_msginfo_set_flags(info, MSG_UNREAD | MSG_NEW, 0);
return TRUE;
case MATCHACTION_COLOR:
- MSG_SET_COLORLABEL_VALUE(info->flags, action->labelcolor);
+ procmsg_msginfo_unset_flags(info, MSG_CLABEL_FLAG_MASK, 0);
+ procmsg_msginfo_set_flags(info, MSG_COLORLABEL_TO_FLAGS(action->labelcolor), 0);
return TRUE;
case MATCHACTION_FORWARD:
gtk_widget_destroy(compose->window);
return FALSE;
- case MATCHACTION_BOUNCE:
+ case MATCHACTION_REDIRECT:
account = account_find_from_id(action->account_id);
- compose = compose_bounce(account, info);
+ compose = compose_redirect(account, info);
if (compose->account->protocol == A_NNTP)
break;
else
if (FALSE == (result = filteringaction_apply(filtering->action, info, foldertable))) {
g_warning(_("action %s could not be applied"),
- filteringaction_to_string(buf, sizeof buf, filtering->action));
+ filteringaction_to_string(buf, sizeof buf, filtering->action));
}
return result;
}
case MATCHACTION_MARK_AS_UNREAD:
case MATCHACTION_FORWARD:
case MATCHACTION_FORWARD_AS_ATTACHMENT:
- case MATCHACTION_BOUNCE:
+ case MATCHACTION_REDIRECT:
return FALSE; /* MsgInfo still valid for message */
default:
return FALSE;
/* put in inbox if a final rule could not be applied, or
* the last rule was not a final one. */
if ((final && !applied) || !final) {
- if (folder_item_move_msg(inbox, info) == -1) {
- debug_print(_("*** Could not drop message in inbox; still in .processing\n"));
- return;
- }
- if (folder_table) {
- val = GPOINTER_TO_INT(g_hash_table_lookup
- (folder_table, inbox));
- if (val == 0) {
- folder_item_scan(inbox);
- g_hash_table_insert(folder_table, inbox,
- GINT_TO_POINTER(1));
+ if (inbox != info->folder) {
+ if (folder_item_move_msg(inbox, info) == -1) {
+ debug_print("*** Could not drop message in inbox; check .processing\n");
+ return;
+ }
+ if (folder_table) {
+ val = GPOINTER_TO_INT(g_hash_table_lookup
+ (folder_table, inbox));
+ if (val == 0) {
+ folder_item_scan(inbox);
+ g_hash_table_insert(folder_table, inbox,
+ GINT_TO_POINTER(1));
+ }
}
- }
+ }
}
}
-void filter_msginfo_move_or_delete(GSList * filtering_list, MsgInfo * info,
- GHashTable *folder_table)
+/*!
+ *\brief filters a message based on its message info data
+ *
+ *\param flist filter and actions list
+ *\param info message
+ *\param ftable table with changed folders after call
+ */
+void filter_message_by_msginfo_with_inbox(GSList *flist, MsgInfo *info, GHashTable *ftable, FolderItem *def_inbox)
{
- GSList * l;
-
- if (info == NULL) {
- g_warning(_("msginfo is not set"));
- return;
- }
-
- for(l = filtering_list ; l != NULL ; l = g_slist_next(l)) {
- FilteringProp * filtering = (FilteringProp *) l->data;
+ FolderItem *inbox;
+
+ if ((def_inbox == NULL)) {
+ debug_print("using default inbox as final destination!\n");
+ inbox = folder_get_default_inbox();
+ } else
+ inbox = def_inbox;
+
+ /*
+ * message is already in a folder. the filtering code will
+ * handle duplicate moves and copies.
+ */
+ filter_msginfo(flist, inbox, info, ftable);
+}
- switch (filtering->action->type) {
- case MATCHACTION_MOVE:
- case MATCHACTION_DELETE:
- if (filtering_match_condition(filtering, info) &&
- filtering_apply_rule(filtering, info, folder_table))
- return;
- }
- }
+void filter_message_by_msginfo(GSList *flist, MsgInfo *info, GHashTable *ftable)
+{
+ filter_message_by_msginfo_with_inbox(flist, info, ftable, info->folder);
}
+/*!
+ *\brief filters a message waiting to be processed in the
+ * .processing folder.
+ *
+ *\param filtering_list list of filters and actions
+ *\param inbox default inbox when no filter could be applied
+ *\param msgnum message number in processing folder
+ *\param folder_table table with folders that have been
+ * changed after the call to this function
+ */
void filter_message(GSList *filtering_list, FolderItem *inbox,
gint msgnum, GHashTable *folder_table)
{
return;
}
- msginfo = procheader_parse(filename, msgflags, TRUE, FALSE);
+ msginfo = procheader_parse_file(filename, msgflags, TRUE, FALSE);
g_free(filename);
g_snprintf(dest, destlen, "%s", command_str);
return dest;
- case MATCHACTION_BOUNCE:
+ case MATCHACTION_REDIRECT:
case MATCHACTION_FORWARD:
case MATCHACTION_FORWARD_AS_ATTACHMENT:
g_snprintf(dest, destlen, "%s %d \"%s\"", command_str, action->account_id, action->destination);
case MATCHACTION_COLOR:
g_snprintf(dest, destlen, "%s %d", command_str, action->labelcolor);
return dest;
-
+ case MATCHACTION_DELETE_ON_SERVER:
+ g_snprintf(dest, destlen, "%s", command_str);
+ return dest;
default:
return NULL;
}
projects / claws.git / blobdiff