2006-04-06 [mones] 2.1.0cvs7

[claws.git] / src / filtering.c

diff --git a/src/filtering.c b/src/filtering.c
index 10bc193551111045db7d6a1442a761a8c4703d06..6437f86ae3f59b7f9a4203248c96f7dfc8f70f40 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -78,8 +78,7 @@ FilteringAction * filteringaction_new(int type, int account_id,
 void filteringaction_free(FilteringAction * action)
 {
        g_return_if_fail(action);
-       if (action->destination)
-               g_free(action->destination);
+       g_free(action->destination);
        g_free(action);
 }
 
@@ -163,6 +162,13 @@ void filteringprop_free(FilteringProp * prop)
        g_free(prop);
 }
 
+void filtering_move_and_copy_msg(MsgInfo *msginfo)
+{
+       GSList *list = g_slist_append(NULL, msginfo);
+       filtering_move_and_copy_msgs(list);
+       g_slist_free(list);
+}
+
 /* move and copy messages by batches to be faster on IMAP */
 void filtering_move_and_copy_msgs(GSList *msgs)
 {
@@ -177,7 +183,7 @@ void filtering_move_and_copy_msgs(GSList *msgs)
                for (cur = messages; cur; cur = cur->next) {
                        MsgInfo *info = (MsgInfo *)cur->data;
                        if (last_item == NULL) {
-                               last_item = info->to_folder;
+                               last_item = info->to_filter_folder;
                        }
                        if (last_item == NULL)
                                continue;
@@ -189,7 +195,7 @@ void filtering_move_and_copy_msgs(GSList *msgs)
                                        is_move = TRUE;
                        }
                        found++;
-                       if (info->to_folder == last_item 
+                       if (info->to_filter_folder == last_item 
                        &&  info->is_copy == is_copy
                        &&  info->is_move == is_move) {
                                batch = g_slist_append(batch, info);
@@ -204,13 +210,14 @@ void filtering_move_and_copy_msgs(GSList *msgs)
                        messages = g_slist_remove(messages, info);
                }
                if (g_slist_length(batch)) {
+                       MsgInfo *info = (MsgInfo *)batch->data;
                        debug_print("%s %d messages to %s\n",
                                is_copy?"copying":"moving",
                                g_slist_length(batch),
                                folder_item_get_path(last_item));
-                       if (is_copy) {
+                       if (is_copy && last_item != info->folder) {
                                folder_item_copy_msgs(last_item, batch);
-                       } else if (is_move) {
+                       } else if (is_move && last_item != info->folder) {
                                if (folder_item_move_msgs(last_item, batch) < 0)
                                        folder_item_move_msgs(
                                                folder_get_default_inbox(), 
@@ -255,7 +262,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info)
                
                /* mark message to be moved */          
                info->is_move = TRUE;
-               info->to_folder = dest_folder;
+               info->to_filter_folder = dest_folder;
                debug_print("set to move to %s\n", folder_item_get_path(dest_folder));
                return TRUE;
 
@@ -271,7 +278,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info)
 
                /* mark message to be copied */         
                info->is_copy = TRUE;
-               info->to_folder = dest_folder;
+               info->to_filter_folder = dest_folder;
                debug_print("set to copy to %s\n", folder_item_get_path(dest_folder));
                return TRUE;
 
@@ -314,7 +321,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info)
                account = account_find_from_id(action->account_id);
                compose = compose_forward(account, info,
                        action->type == MATCHACTION_FORWARD ? FALSE : TRUE,
-                       NULL, TRUE);
+                       NULL, TRUE, TRUE);
                compose_entry_append(compose, action->destination,
                                     compose->account->protocol == A_NNTP
                                            ? COMPOSE_NEWSGROUPS
@@ -326,7 +333,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info)
 
        case MATCHACTION_REDIRECT:
                account = account_find_from_id(action->account_id);
-               compose = compose_redirect(account, info);
+               compose = compose_redirect(account, info, TRUE);
                if (compose->account->protocol == A_NNTP)
                        break;
                else
@@ -362,6 +369,10 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info)
                 info->hidden = TRUE;
                 return TRUE;
 
+       case MATCHACTION_IGNORE:
+                procmsg_msginfo_set_flags(info, MSG_IGNORE_THREAD, 0);
+                return TRUE;
+
        default:
                break;
        }
@@ -520,6 +531,7 @@ gchar *filteringaction_to_string(gchar *dest, gint destlen, FilteringAction *act
        case MATCHACTION_MARK_AS_UNREAD:
        case MATCHACTION_STOP:
        case MATCHACTION_HIDE:
+       case MATCHACTION_IGNORE:
                g_snprintf(dest, destlen, "%s", command_str);
                return dest;