Use selected text on reply/forward.
[claws.git] / src / filtering.c
index fcf7f700631651bc216d17e7e357ed63b44395e7..d3a2070f7e47fcb5dc4f052be2bd64c00fd76e87 100644 (file)
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* 
- * initital    Hoa             initial
- * 07/16/01    Alfons          fix bugs
- * 07/18/01    Alfons          rewrite things
- */
-
-/* 07/18/01 (alfons) 
- * 
- * filter_message() is no longer the entry point for filtering. it's
- * replaced with filter_incoming_message() which does not trust
- * on MsgInfo's from a folder. instead it directly works with
- * the temporary file.  
- * updating the mark file is a lot easier now, because we can do that
- * right after a call to folder_item_add_msg(). 
- */ 
-
 #include "defs.h"
 #include <ctype.h>
 #include <string.h>
 
 GSList * global_processing = NULL;
 
+#define STRLEN_WITH_CHECK(expr) \
+        strlen_with_check(#expr, __LINE__, expr)
+               
+static inline gint strlen_with_check(const gchar *expr, gint fline, const gchar *str)
+{
+        if (str) 
+               return strlen(str);
+       else {
+               debug_print("%s(%d) - invalid string %s\n", __FILE__, fline, expr);
+               return 0;
+       }
+}
+
 FilteringAction * filteringaction_new(int type, int account_id,
                                      gchar * destination,
                                      gint labelcolor)
@@ -62,16 +59,24 @@ FilteringAction * filteringaction_new(int type, int account_id,
 
        action->type = type;
        action->account_id = account_id;
-       if (destination)
-               action->destination = g_strdup(destination);
+       if (destination) {
+               action->destination       = g_strdup(destination);
+               action->unesc_destination = matcher_unescape_str(g_strdup(destination));
+       } else {
+               action->destination       = NULL;
+               action->unesc_destination = NULL;
+       }
        action->labelcolor = labelcolor;        
        return action;
 }
 
 void filteringaction_free(FilteringAction * action)
 {
+       g_return_if_fail(action);
        if (action->destination)
                g_free(action->destination);
+       if (action->unesc_destination)
+               g_free(action->unesc_destination);
        g_free(action);
 }
 
@@ -94,205 +99,6 @@ void filteringprop_free(FilteringProp * prop)
        g_free(prop);
 }
 
-/* filteringaction_update_mark() - updates a mark for a message. note that
- * the message should not have been moved or copied. remember that the
- * procmsg_open_mark_file(PATH, TRUE) actually _appends_ a new record.
- */
-static gboolean filteringaction_update_mark(MsgInfo * info)
-{
-       gchar * dest_path;
-       FILE * fp;
-
-       if (info->folder->folder->type == F_MH) {
-               dest_path = folder_item_get_path(info->folder);
-               if (!is_dir_exist(dest_path))
-                       make_dir_hier(dest_path);
-               
-               if (dest_path == NULL) {
-                       g_warning(_("Can't open mark file.\n"));
-                       return FALSE;
-               }
-               
-               if ((fp = procmsg_open_mark_file(dest_path, TRUE))
-                   == NULL) {
-                       g_warning(_("Can't open mark file.\n"));
-                       return FALSE;
-               }
-               
-               procmsg_write_flags(info, fp);
-               fclose(fp);
-               return TRUE;
-       }
-       return FALSE;
-}
-
-static inline gint strlen_with_check(const gchar *expr, gint fline, const gchar *str)
-{
-       if (str) 
-               return strlen(str);
-       else {
-               debug_print("%s(%d) - invalid string %s\n", __FILE__, fline, expr);
-               return 0;
-       }
-}
-
-#define STRLEN_WITH_CHECK(expr) \
-       strlen_with_check(#expr, __LINE__, expr)
-       
-static gchar * filteringaction_execute_command(gchar * cmd, MsgInfo * info)
-{
-       gchar * s = cmd;
-       gchar * filename = NULL;
-       gchar * processed_cmd;
-       gchar * p;
-       gint size;
-
-       matcher_unescape_str(cmd);
-
-       size = strlen(cmd) + 1;
-       while (*s != '\0') {
-               if (*s == '%') {
-                       s++;
-                       switch (*s) {
-                       case '%':
-                               size -= 1;
-                               break;
-                       case 's': /* subject */
-                               size += STRLEN_WITH_CHECK(info->subject) - 2;
-                               break;
-                       case 'f': /* from */
-                               size += STRLEN_WITH_CHECK(info->from) - 2;
-                               break;
-                       case 't': /* to */
-                               size += STRLEN_WITH_CHECK(info->to) - 2;
-                               break;
-                       case 'c': /* cc */
-                               size += STRLEN_WITH_CHECK(info->cc) - 2;
-                               break;
-                       case 'd': /* date */
-                               size += STRLEN_WITH_CHECK(info->date) - 2;
-                               break;
-                       case 'i': /* message-id */
-                               size += STRLEN_WITH_CHECK(info->msgid) - 2;
-                               break;
-                       case 'n': /* newsgroups */
-                               size += STRLEN_WITH_CHECK(info->newsgroups) - 2;
-                               break;
-                       case 'r': /* references */
-                               size += STRLEN_WITH_CHECK(info->references) - 2;
-                               break;
-                       case 'F': /* file */
-                               if (MSG_IS_FILTERING(info->flags))
-                                       filename = g_strdup((gchar *)info->folder);
-                               else
-                                       filename = folder_item_fetch_msg(info->folder, info->msgnum);
-                               
-                               if (filename == NULL) {
-                                       g_warning(_("filename is not set"));
-                                       return NULL;
-                               }
-                               else
-                                       size += strlen(filename) - 2;
-                               break;
-                       }
-                       s++;
-               }
-               else s++;
-       }
-
-
-       processed_cmd = g_new0(gchar, size);
-       s = cmd;
-       p = processed_cmd;
-
-       while (*s != '\0') {
-               if (*s == '%') {
-                       s++;
-                       switch (*s) {
-                       case '%':
-                               *p = '%';
-                               p++;
-                               break;
-                       case 's': /* subject */
-                               if (info->subject != NULL)
-                                       strcpy(p, info->subject);
-                               else
-                                       strcpy(p, "(none)");
-                               p += strlen(p);
-                               break;
-                       case 'f': /* from */
-                               if (info->from != NULL)
-                                       strcpy(p, info->from);
-                               else
-                                       strcpy(p, "(none)");
-                               p += strlen(p);
-                               break;
-                       case 't': /* to */
-                               if (info->to != NULL)
-                                       strcpy(p, info->to);
-                               else
-                                       strcpy(p, "(none)");
-                               p += strlen(p);
-                               break;
-                       case 'c': /* cc */
-                               if (info->cc != NULL)
-                                       strcpy(p, info->cc);
-                               else
-                                       strcpy(p, "(none)");
-                               p += strlen(p);
-                               break;
-                       case 'd': /* date */
-                               if (info->date != NULL)
-                                       strcpy(p, info->date);
-                               else
-                                       strcpy(p, "(none)");
-                               p += strlen(p);
-                               break;
-                       case 'i': /* message-id */
-                               if (info->msgid != NULL)
-                                       strcpy(p, info->msgid);
-                               else
-                                       strcpy(p, "(none)");
-                               p += strlen(p);
-                               break;
-                       case 'n': /* newsgroups */
-                               if (info->newsgroups != NULL)
-                                       strcpy(p, info->newsgroups);
-                               else
-                                       strcpy(p, "(none)");
-                               p += strlen(p);
-                               break;
-                       case 'r': /* references */
-                               if (info->references != NULL)
-                                       strcpy(p, info->references);
-                               else
-                                       strcpy(p, "(none)");
-                               p += strlen(p);
-                               break;
-                       case 'F': /* file */
-                               strcpy(p, filename);
-                               p += strlen(p);
-                               break;
-                       default:
-                               *p = '%';
-                               p++;
-                               *p = *s;
-                               p++;
-                               break;
-                       }
-                       s++;
-               }
-               else {
-                       *p = *s;
-                       p++;
-                       s++;
-               }
-       }
-
-       g_free(filename);
-       return processed_cmd;
-}
-
 /*
   fitleringaction_apply
   runs the action on one MsgInfo
@@ -324,16 +130,10 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
                        return FALSE;
                
                if (folder_item_move_msg(dest_folder, info) == -1) {
+                       debug_print("*** could not move message\n");
                        return FALSE;
                }       
 
-               /* WRONG: can not update the mark, because the message has 
-                * been moved. info pertains to original location. 
-                * folder_item_move_msg() already updated the mark for the
-                * destination folder.
-               info->flags = 0;
-               filteringaction_update_mark(info);
-                */
                if (folder_table) {
                        val = GPOINTER_TO_INT(g_hash_table_lookup
                                              (folder_table, dest_folder));
@@ -342,13 +142,6 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
                                g_hash_table_insert(folder_table, dest_folder,
                                                    GINT_TO_POINTER(1));
                        }
-                       val = GPOINTER_TO_INT(g_hash_table_lookup
-                                             (folder_table, info->folder));
-                       if (val == 0) {
-                               folder_item_scan(info->folder);
-                               g_hash_table_insert(folder_table, info->folder,
-                                                   GINT_TO_POINTER(1));
-                       }
                }
                return TRUE;
 
@@ -359,10 +152,6 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
                if (!dest_folder)
                        return FALSE;
 
-               /* NOTE: the following call *will* update the mark file for
-                * the destination folder. but the original message will
-                * still be there in the inbox. */
-
                if (folder_item_copy_msg(dest_folder, info) == -1)
                        return FALSE;
 
@@ -380,55 +169,31 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
        case MATCHACTION_DELETE:
                if (folder_item_remove_msg(info->folder, info->msgnum) == -1)
                        return FALSE;
-
-               /* WRONG: can not update the mark. this would actually add
-                * a bogus record to the mark file for the message's original 
-                * folder. 
-               info->flags = 0;
-               filteringaction_update_mark(info);
-                */
-
                return TRUE;
 
        case MATCHACTION_MARK:
                MSG_SET_PERM_FLAGS(info->flags, MSG_MARKED);
-               debug_print("*** MARKING message %d, in folder %s, \"%s\"\n",
-                           info->msgnum, info->folder->name,
-                           info->subject ? info->subject : "<none>");
-               filteringaction_update_mark(info);
-
-               CHANGE_FLAGS(info);
-
                return TRUE;
 
        case MATCHACTION_UNMARK:
                MSG_UNSET_PERM_FLAGS(info->flags, MSG_MARKED);
-               filteringaction_update_mark(info);
-
-               CHANGE_FLAGS(info);
-
                return TRUE;
                
        case MATCHACTION_MARK_AS_READ:
                MSG_UNSET_PERM_FLAGS(info->flags, MSG_UNREAD | MSG_NEW);
-               filteringaction_update_mark(info);
-
-               CHANGE_FLAGS(info);
-
                return TRUE;
 
        case MATCHACTION_MARK_AS_UNREAD:
                MSG_SET_PERM_FLAGS(info->flags, MSG_UNREAD | MSG_NEW);
-               filteringaction_update_mark(info);
-
-               CHANGE_FLAGS(info);
-               
+               return TRUE;
+       
+       case MATCHACTION_COLOR:
+               MSG_SET_COLORLABEL_VALUE(info->flags, action->labelcolor);
                return TRUE;
 
        case MATCHACTION_FORWARD:
-
                account = account_find_from_id(action->account_id);
-               compose = compose_forward(account, info, FALSE);
+               compose = compose_forward(account, info, FALSE, NULL);
                if (compose->account->protocol == A_NNTP)
                        compose_entry_append(compose, action->destination,
                                             COMPOSE_NEWSGROUPS);
@@ -448,7 +213,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
        case MATCHACTION_FORWARD_AS_ATTACHMENT:
 
                account = account_find_from_id(action->account_id);
-               compose = compose_forward(account, info, TRUE);
+               compose = compose_forward(account, info, TRUE, NULL);
                if (compose->account->protocol == A_NNTP)
                        compose_entry_append(compose, action->destination,
                                             COMPOSE_NEWSGROUPS);
@@ -461,12 +226,10 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
                        gtk_widget_destroy(compose->window);
                        return TRUE;
                }
-
                gtk_widget_destroy(compose->window);
                return FALSE;
 
        case MATCHACTION_BOUNCE:
-
                account = account_find_from_id(action->account_id);
                compose = compose_bounce(account, info);
                if (compose->account->protocol == A_NNTP)
@@ -485,15 +248,13 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
                return FALSE;
 
        case MATCHACTION_EXECUTE:
-
-               cmd = matching_build_command(action->destination, info);
+               cmd = matching_build_command(action->unesc_destination, info);
                if (cmd == NULL)
-                       return TRUE;
+                       return FALSE;
                else {
                        system(cmd);
                        g_free(cmd);
                }
-
                return TRUE;
 
        default:
@@ -501,69 +262,85 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
        }
 }
 
-/* filteringprop_apply() - runs the action on one MsgInfo if it matches the 
- * criterium. certain actions can be followed by other actions. in this
- * case the function returns FALSE. if an action can not be followed
- * by others, the function returns TRUE.
- *
- * remember that this is because of the fact that msg flags are always
- * _appended_ to mark files. currently sylpheed does not insert messages 
- * at a certain index. 
- * now, after having performed a certain action, the MsgInfo is still
- * valid for the message. in *this* case the function returns FALSE.
- */
-static gboolean filteringprop_apply(FilteringProp * filtering, MsgInfo * info,
-                                   GHashTable *folder_table)
+static gboolean filtering_match_condition(FilteringProp *filtering, MsgInfo *info)
 {
-       if (matcherlist_match(filtering->matchers, info)) {
-               gboolean result;
-               gchar   *action_str;
-               gchar    buf[256]; 
-
-               if (FALSE == (result = filteringaction_apply(filtering->action, info,
-                                              folder_table))) {
-                       action_str = filteringaction_to_string(buf, sizeof buf, filtering->action);
-                       g_warning(_("action %s could not be applied"), action_str);
-                       g_free(action_str);
-               }
+       return matcherlist_match(filtering->matchers, info);
+}
 
-               switch(filtering->action->type) {
-               case MATCHACTION_MOVE:
-               case MATCHACTION_DELETE:
-                       return TRUE; /* MsgInfo invalid for message */
-               case MATCHACTION_EXECUTE:
-               case MATCHACTION_COPY:
-               case MATCHACTION_MARK:
-               case MATCHACTION_MARK_AS_READ:
-               case MATCHACTION_UNMARK:
-               case MATCHACTION_MARK_AS_UNREAD:
-               case MATCHACTION_FORWARD:
-               case MATCHACTION_FORWARD_AS_ATTACHMENT:
-               case MATCHACTION_BOUNCE:
-                       return FALSE; /* MsgInfo still valid for message */
-               default:
-                       return FALSE;
-               }
+static gboolean filtering_apply_rule(FilteringProp *filtering, MsgInfo *info, 
+                                    GHashTable *foldertable)
+{
+       gboolean result;
+       gchar    actionstr;
+       gchar    buf[50];
+
+       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));
        }
-       else
-               return FALSE;
+       return result;
 }
 
-void filter_msginfo(GSList * filtering_list, MsgInfo * info,
-                   GHashTable *folder_table)
+static gboolean filtering_is_final_action(FilteringProp *filtering)
 {
-       GSList * l;
+       switch(filtering->action->type) {
+       case MATCHACTION_MOVE:
+       case MATCHACTION_DELETE:
+               return TRUE; /* MsgInfo invalid for message */
+       case MATCHACTION_EXECUTE:
+       case MATCHACTION_COPY:
+       case MATCHACTION_MARK:
+       case MATCHACTION_MARK_AS_READ:
+       case MATCHACTION_UNMARK:
+       case MATCHACTION_MARK_AS_UNREAD:
+       case MATCHACTION_FORWARD:
+       case MATCHACTION_FORWARD_AS_ATTACHMENT:
+       case MATCHACTION_BOUNCE:
+               return FALSE; /* MsgInfo still valid for message */
+       default:
+               return FALSE;
+       }
+}
 
+static void filter_msginfo(GSList * filtering_list, FolderItem *inbox,
+                          MsgInfo * info, GHashTable *folder_table)
+{
+       GSList  *l;
+       gboolean final;
+       gboolean applied;
+       gint val;
+       
        if (info == NULL) {
                g_warning(_("msginfo is not set"));
                return;
        }
        
-       for(l = filtering_list ; l != NULL ; l = g_slist_next(l)) {
+       for (l = filtering_list, final = FALSE, applied = FALSE; l != NULL; l = g_slist_next(l)) {
                FilteringProp * filtering = (FilteringProp *) l->data;
-               
-               if (filteringprop_apply(filtering, info, folder_table))
-                       break;
+
+               if (filtering_match_condition(filtering, info)) {
+                       applied = filtering_apply_rule(filtering, info, folder_table);
+                       if (TRUE == (final = filtering_is_final_action(filtering)))
+                               break;
+               }               
+       }
+
+       /* 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));
+                       }
+               }
        }
 }
 
@@ -583,18 +360,20 @@ void filter_msginfo_move_or_delete(GSList * filtering_list, MsgInfo * info,
                switch (filtering->action->type) {
                case MATCHACTION_MOVE:
                case MATCHACTION_DELETE:
-                       if (filteringprop_apply(filtering, info, folder_table))
+                       if (filtering_match_condition(filtering, info) &&
+                           filtering_apply_rule(filtering, info, folder_table))
                                return;
                }
        }
 }
 
-void filter_message(GSList * filtering_list, FolderItem * item,
+void filter_message(GSList *filtering_list, FolderItem *inbox,
                    gint msgnum, GHashTable *folder_table)
 {
-       MsgInfo * msginfo;
-       gchar * filename;
+       MsgInfo *msginfo;
+       gchar *filename;
        MsgFlags  msgflags = { 0, 0 };
+       FolderItem *item = folder_get_default_processing();
 
        if (item == NULL) {
                g_warning(_("folderitem not set"));
@@ -608,7 +387,7 @@ void filter_message(GSList * filtering_list, FolderItem * item,
                return;
        }
 
-       msginfo = procheader_parse(filename, msgflags, TRUE);
+       msginfo = procheader_parse(filename, msgflags, TRUE, FALSE);
        
        g_free(filename);
 
@@ -620,419 +399,11 @@ void filter_message(GSList * filtering_list, FolderItem * item,
        msginfo->folder = item;
        msginfo->msgnum = msgnum;
 
-       filter_msginfo(filtering_list, msginfo, folder_table);
-}
-
-
-/******************************************************************************/
-
-/* revised filtering system.  
- * 
- * 07/18/01    alfons          initial revisement
- */
-
-/* (alfons)
- * 
- * the revised filtering system does not rely on a message being "registered"
- * in one of sylpheed's folders. it now uses the file sylpheed created on
- * incorporation of mail. 
- * i do use MsgInfo data; that's needed by the matcher, but for the rest
- * the MsgInfo is not really used. */
-
-/* add_mark() - adds a mark for a file */
-static void add_mark(FolderItem *folder, gint msgnum, MsgPermFlags flags)
-{
-       gchar * dest_path;
-       FILE * fp;
-
-       if (folder->folder->type == F_MH) {
-               dest_path = folder_item_get_path(folder);
-               if (!is_dir_exist(dest_path))
-                       make_dir_hier(dest_path);
-               
-               if (dest_path == NULL) {
-                       g_warning(_("Can't open mark file.\n"));
-                       return;
-               }
-               
-               if ((fp = procmsg_open_mark_file(dest_path, TRUE))
-                   == NULL) {
-                       g_warning(_("Can't open mark file.\n"));
-                       return;
-               }
-
-               /* TODO: straight from procmsg.c:procmsg_write_flags()
-                * should update this when mark file version changes */
-#if MARK_VERSION == 2           
-               WRITE_CACHE_DATA_INT(msgnum, fp);
-               WRITE_CACHE_DATA_INT(flags, fp);
-#else
-#error should rewrite the above for new  mark version  
-               /* paste the source code of procmsg.c:procmsg_write_flags() */
-#endif
-               fclose(fp);
-               return;
-       }
-       return;
-}
-
-/* prepare_destination() - prepares destination folder by registering it 
- * in the global folder table (if not already there). it returns TRUE if
- * successful. it also returns the FolderItem for the destination */
-static gboolean prepare_destination(const gchar *destination, FolderItem **item, 
-                                   GHashTable *folder_table)
-{
-       gint val;
-       FolderItem *result;
-
-       result = folder_find_item_from_identifier(destination);
-       if (!result)
-               return FALSE;
-       if (folder_table) {
-               *item = result;
-               val = GPOINTER_TO_INT(g_hash_table_lookup(folder_table, *item));
-               if (val == 0) {
-                       folder_item_scan(*item);
-                       g_hash_table_insert(folder_table, *item, GINT_TO_POINTER(1));
-               }
-       }
-       return TRUE;
-}
-
-/* filter_incoming_perform_actions() - performs actions on incoming
- * message. this function handles updating marks a little bit smarter;
- * remember that marks can only be appended. */
-static gboolean filter_incoming_perform_actions(FolderItem *default_folder, 
-                                               MsgInfo    *msginfo,
-                                               GHashTable *folder_table)
-{
-       /* matching actions for msginfo */
-       struct matching_action {
-               FilteringAction         *action;
-               struct matching_action  *next;
-       };
-
-       struct matching_action  ma_head = { NULL, NULL };
-       struct matching_action *ma_tail = &ma_head;
-
-       /* need this for the forwarding stuff */
-       PrefsAccount *account;
-       Compose      *compose;
-       MsgFlags      tmp;
-       gchar        *fwd_msg_name;
-       gint          val;
-       MsgInfo      *fwd_msg;
-
-       MsgFlags     markflags = { 0, 0 };
-
-       /* use the global prefs_filtering list */
-       GSList *     list = global_processing;
-
-       /* things we get after having added a message to a folder */
-       FolderItem  *dest_folder;
-       gint         msgnum;
-       
-       /* after performing certain action, we may have to copy 
-        * the message to inbox too */
-       gboolean     copy_to_inbox_too = TRUE;
-       
-       /* filename is only put in msginfo->folder if MSG_FILTERING is set. */
-       const gchar *filename = (gchar *) msginfo->folder;
-       
-       MsgPermFlags flags;
-       gboolean     stop;
-       gchar        *cmd;
-
-       /* build list of matching actions */
-       for (; list != NULL; list = g_slist_next(list)) {
-               FilteringProp *prop = (FilteringProp *) list->data;
-               
-               if (!matcherlist_match(prop->matchers, msginfo))
-                       continue;
-
-               if (NULL == (ma_tail->next = alloca(sizeof(struct matching_action)))) {
-                       debug_print(_("action allocation error\n"));
-                       break;
-               }
-
-               debug_print("*** action %d\n", prop->action->type);
-
-               ma_tail->action = prop->action;
-               ma_tail->next->action = NULL;
-               ma_tail->next->next = NULL;
-               ma_tail = ma_tail->next;
-       }
-
-       debug_print("*** collecting marks\n");          
-       
-       /* collect all marks */
-       for (ma_tail = &ma_head, stop = FALSE; ma_tail->action && !stop; ma_tail = ma_tail->next) {
-               switch (ma_tail->action->type) {
-               
-               case MATCHACTION_MARK:
-                       MSG_SET_PERM_FLAGS(markflags, MSG_MARKED);
-                       break;
-                       
-               case MATCHACTION_UNMARK:
-                       MSG_UNSET_PERM_FLAGS(markflags, MSG_MARKED);
-                       break;
-               
-               case MATCHACTION_MARK_AS_READ:
-                       MSG_UNSET_PERM_FLAGS(markflags, MSG_UNREAD);
-                       break;
-
-               case MATCHACTION_MARK_AS_UNREAD:                        
-                       MSG_SET_PERM_FLAGS(markflags, MSG_UNREAD);
-                       break;
-
-               case MATCHACTION_COLOR:
-                       MSG_SET_COLORLABEL_VALUE(markflags, ma_tail->action->labelcolor);
-                       break;
-
-               /* UNCONTINUABLE */
-               case MATCHACTION_FORWARD:
-               case MATCHACTION_FORWARD_AS_ATTACHMENT:
-               case MATCHACTION_BOUNCE:
-               case MATCHACTION_MOVE:
-               case MATCHACTION_DELETE:
-                       stop = TRUE;
-                       break;
-               
-               default:
-                       break;
-               }
-       }
-
-
-       /* msgnum & dest_folder should have valid values after a succesful
-        * drop; in this case there is a MsgInfo available */
-       msgnum      = -1;
-       dest_folder = NULL;
-
-       debug_print("*** performing actions\n"); 
-       
-       for (ma_tail = &ma_head ; ma_tail->action; ma_tail = ma_tail->next) {
-
-               /* there are variables you have to use when defining new actions:
-                *
-                * copy_to_inbox_too - if the original message should be copied to the inbox 
-                *                     (default_folder) too.
-                * 
-                * also note that after dropping it to a folder (folder_item_add_msg()) you have
-                * to mark the message, just to make sure any defined mark actions are applied. */
-                
-#define ACTION (ma_tail->action->type) 
-
-               /* C O N T I N U A B L E */
-
-               if (MATCHACTION_COPY == ACTION) {
-                       debug_print("*** performing copy\n");
-                       copy_to_inbox_too = TRUE;
-                       if (!prepare_destination(ma_tail->action->destination, &dest_folder, folder_table)) {
-                               debug_print("Rule failed: unknown destination %s\n", ma_tail->action->destination);
-                               continue; /* try next action */
-                       }
-                       if (0 > (msgnum = folder_item_add_msg(dest_folder, filename, FALSE))) {
-                               debug_print(_("Rule failed: could not copy to folder %s\n"),
-                                           ma_tail->action->destination);
-                               continue; /* try next action */     
-                       }   
-                       flags = msginfo->flags.perm_flags | markflags.perm_flags;
-                       add_mark(dest_folder, msgnum, flags);
-               }               
-               else if (MATCHACTION_EXECUTE == ACTION) {
-                       debug_print("*** performing exec\n");
-                       copy_to_inbox_too = TRUE;
-                       
-                       /* matching_build_command() knows about filtering */
-                       cmd = matching_build_command(ma_tail->action->destination, msginfo);
-                       if (cmd) { 
-                               system(cmd);
-                               g_free(cmd);
-                       }
-                       else
-                               debug_print(_("Rule failed: no command line\n"));
-               } 
-
-               /* U N C O N T I N U A B L E */
-               
-               else if (MATCHACTION_FORWARD == ACTION
-                        || MATCHACTION_FORWARD_AS_ATTACHMENT == ACTION) {
-                       debug_print("*** performing forward\n");
-
-                       /* forwarding messages is complicated because there's currently no 
-                        * way to forward a message using "filenames"; you can only forward
-                        * a message if you have its MsgInfo. this means we have to drop
-                        * the message first */ 
-                       if (0 > (msgnum = folder_item_add_msg(default_folder, filename, FALSE))) {
-                               debug_print(_("Rule failed: could not forward\n"));
-                               copy_to_inbox_too = TRUE;
-                               continue;
-                       }
-                               
-                       flags = msginfo->flags.perm_flags | markflags.perm_flags;
-                       flags |= MSG_FORWARDED;
-                       add_mark(default_folder, msgnum, flags);
-
-                       /* grab the dropped message */
-                       fwd_msg_name = folder_item_fetch_msg(default_folder, msgnum);
-
-                       tmp.perm_flags = tmp.tmp_flags = 0;
-                       fwd_msg = procheader_parse(fwd_msg_name, tmp, TRUE);
-
-                       fwd_msg->folder = default_folder;
-                       fwd_msg->msgnum = msgnum;
-
-                       /* do the compose_XXX stuff */
-                       account = account_find_from_id(ma_tail->action->account_id);
-                       compose = compose_forward(account, fwd_msg, ACTION == MATCHACTION_FORWARD ? FALSE : TRUE);
-                       if (compose->account->protocol == A_NNTP)
-                               compose_entry_append(compose, ma_tail->action->destination,
-                                                    COMPOSE_NEWSGROUPS);
-                       else
-                               compose_entry_append(compose, ma_tail->action->destination,
-                                                    COMPOSE_TO);
-
-                       compose_send(compose);
-
-                       procmsg_msginfo_free(fwd_msg);
-                       
-                       gtk_widget_destroy(compose->window);
-                       break;
-               }                       
-               else if (MATCHACTION_BOUNCE == ACTION) {
-                       if (0 > (msgnum = folder_item_add_msg(default_folder, filename, FALSE))) {
-                               debug_print(_("Rule failed: could not forward\n"));
-                               copy_to_inbox_too = TRUE;
-                               continue;
-                       }
-                               
-                       /* grab the dropped message */
-                       fwd_msg_name = folder_item_fetch_msg(default_folder, msgnum);
-
-                       fwd_msg = procheader_parse(fwd_msg_name, tmp, TRUE);
-
-                       fwd_msg->folder = default_folder;
-                       fwd_msg->msgnum = msgnum;
-
-                       /* do the compose_XXX stuff */
-                       account = account_find_from_id(ma_tail->action->account_id);
-                       compose = compose_bounce(account, fwd_msg);
-                       if (compose->account->protocol == A_NNTP)
-                               break;
-                       else
-                               compose_entry_append(compose, ma_tail->action->destination,
-                                                    COMPOSE_TO);
-
-                       compose_send(compose);
-
-                       procmsg_msginfo_free(fwd_msg);
-                       
-                       gtk_widget_destroy(compose->window);
-                       break;
-               }                       
-               else if (MATCHACTION_DELETE == ACTION) {
-                       debug_print("*** performing delete\n");
-                       copy_to_inbox_too = FALSE;
-
-                       /* drop to Trash */
-                       dest_folder = folder_get_default_trash();
-                       msgnum = folder_item_add_msg(dest_folder, filename, FALSE);
-                       if (msgnum < 0) {
-                               debug_print(_("Rule failed: could not move to trash"));
-                               copy_to_inbox_too = TRUE;           
-                       }
-                       else {
-                               flags = msginfo->flags.perm_flags | markflags.perm_flags;
-                               add_mark(dest_folder, msgnum, flags);
-                       }
-                       break;                          
-               }
-               else if (MATCHACTION_MOVE == ACTION) {
-                       debug_print("*** performing move\n");
-                       copy_to_inbox_too = FALSE;
-                       
-                       if (!prepare_destination(ma_tail->action->destination, &dest_folder, folder_table)) {
-                               copy_to_inbox_too = TRUE;
-                               break;
-                       }
-                               
-                       msgnum = folder_item_add_msg(dest_folder, filename, FALSE);
-                       if (msgnum < 0) {
-                               debug_print(_("Rule failed: could not move to folder %s\n"),
-                                           ma_tail->action->destination);
-                               copy_to_inbox_too = TRUE;                                          
-                               break;
-                       }   
-                       
-                       flags = msginfo->flags.perm_flags | markflags.perm_flags;
-                       add_mark(dest_folder, msgnum, flags);
-                       break;
-               }
-       }
-
-       /* may need to copy it to inbox too */
-       if (copy_to_inbox_too) {
-               debug_print("*** performing inbox copy\n");
-               msgnum = folder_item_add_msg(default_folder, filename, TRUE);
-               if (msgnum < 0) {
-                       debug_print(_("error copying incoming file %s to inbox\n"), 
-                                   filename);
-                       return FALSE;                               
-               }
-               flags = msginfo->flags.perm_flags | markflags.perm_flags;
-               add_mark(default_folder, msgnum, flags);
-       }
-       else {
-               debug_print("*** unlinking\n");
-               if (unlink(filename) < 0) 
-                       debug_print(_("error deleting incoming message file\n"));
-       }
-
-#undef ACTION
-
-       return TRUE;
-}
-
-static void filter_incoming_msginfo(FolderItem *default_folder, MsgInfo *msginfo, 
-                                   GHashTable *folder_table)
-{
-       filter_incoming_perform_actions(default_folder, msginfo, folder_table); 
-}
-
-/* filter_incoming_message() - tries to apply a filter on one incoming message.
- * it also handles the case when there's no filter match */
-void filter_incoming_message(FolderItem *default_folder, const gchar *file_name, 
-                            GHashTable *folder_table)
-{
-       MsgInfo *msginfo;
-       MsgFlags msgflags = { 0, 0 };
-       
-       /* make an "uncomplete" msginfo. it's incomplete because it doesn't
-        * have a message number / folder yet. */
-       if (NULL == (msginfo = procheader_parse(file_name, msgflags, TRUE))) {
-               g_warning(_("error filtering incoming message %s\n"), 
-                         file_name);
-               return;         
-       }
-
-       /* let matcher know that this is a message that has no
-        * valid body data yet. */
-       MSG_SET_TMP_FLAGS(msginfo->flags, MSG_FILTERING);
-       msginfo->folder = (FolderItem *) g_strdup(file_name); /* actually storing a pointer to a string */
-       msginfo->msgnum = 0;
+       filter_msginfo(filtering_list, inbox, msginfo, folder_table);
 
-       filter_incoming_msginfo(default_folder, msginfo, folder_table);
-
-       g_free(msginfo->folder);
        procmsg_msginfo_free(msginfo);
 }
 
-/****************************************************************************/
-
-
-
 gchar *filteringaction_to_string(gchar *dest, gint destlen, FilteringAction *action)
 {
        gchar *command_str;
@@ -1067,10 +438,6 @@ gchar *filteringaction_to_string(gchar *dest, gint destlen, FilteringAction *act
                g_snprintf(dest, destlen, "%s %d", command_str, action->labelcolor);
                return dest;  
 
-               g_snprintf(dest, destlen, "%s %d \"%s\"", command_str,
-                          action->account_id, action->destination);
-               return dest;
-
        default:
                return NULL;
        }