* src/filtering.[ch]

[claws.git] / src / filtering.c

diff --git a/src/filtering.c b/src/filtering.c
index a679a62a56bcb6d1d40252fa35b9f42c3380ad21..8505311a86f4127ead0a5f4b42fe6a7b7addc077 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto & The Sylpheed Claws Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -184,16 +184,18 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
                return TRUE;
 
        case MATCHACTION_MARK_AS_UNREAD:
+               debug_print("*** setting unread flags\n");
                MSG_SET_PERM_FLAGS(info->flags, MSG_UNREAD | MSG_NEW);
                return TRUE;
        
        case MATCHACTION_COLOR:
+               MSG_UNSET_PERM_FLAGS(info->flags, MSG_CLABEL_FLAG_MASK); 
                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);
@@ -213,7 +215,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);
@@ -276,7 +278,7 @@ static gboolean filtering_apply_rule(FilteringProp *filtering, MsgInfo *info,
 
        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;
 }
@@ -328,45 +330,63 @@ static void filter_msginfo(GSList * filtering_list, FolderItem *inbox,
        /* 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)
 {
@@ -437,7 +457,9 @@ gchar *filteringaction_to_string(gchar *dest, gint destlen, FilteringAction *act
        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;
        }