2005-07-20 [colin] 1.9.12cvs87
[claws.git] / src / folder.c
index f404a76f48368a017a7bb623f173048903ba4997..baf243d853b737a925a84fb429bd9618eca9b418 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "folder.h"
 #include "session.h"
+#include "inc.h"
 #include "imap.h"
 #include "news.h"
 #include "mh.h"
@@ -49,6 +50,7 @@
 #include "folder_item_prefs.h"
 #include "remotefolder.h"
 #include "partial_download.h"
+#include "statusbar.h"
 
 /* Dependecies to be removed ?! */
 #include "prefs_common.h"
@@ -154,6 +156,9 @@ Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
 
        /* Create root folder item */
        item = folder_item_new(folder, name, NULL);
+       if (item == NULL) {
+               return NULL;
+       }
        item->folder = folder;
        folder->node = item->node = g_node_new(item);
        folder->data = NULL;
@@ -255,7 +260,9 @@ XMLTag *folder_get_xml(Folder *folder)
 FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path)
 {
        FolderItem *item = NULL;
-
+       
+       g_return_val_if_fail(folder != NULL, NULL);
+       
        if (folder->klass->item_new) {
                item = folder->klass->item_new(folder);
        } else {
@@ -271,6 +278,7 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
        item->new_msgs = 0;
        item->unread_msgs = 0;
        item->unreadmarked_msgs = 0;
+       item->marked_msgs = 0;
        item->total_msgs = 0;
        item->last_num = -1;
        item->cache = NULL;
@@ -331,7 +339,6 @@ void folder_item_remove(FolderItem *item)
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
        g_return_if_fail(item->node != NULL);
-
        node = item->node;
 
        if (item->folder->node == node)
@@ -441,6 +448,8 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
                        item->unread_msgs = atoi(attr->value);
                else if (!strcmp(attr->name, "unreadmarked"))
                        item->unreadmarked_msgs = atoi(attr->value);
+               else if (!strcmp(attr->name, "marked"))
+                       item->marked_msgs = atoi(attr->value);
                else if (!strcmp(attr->name, "total"))
                        item->total_msgs = atoi(attr->value);
                else if (!strcmp(attr->name, "no_sub"))
@@ -542,6 +551,7 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
        xml_tag_add_attr(tag, xml_attr_new_int("new", item->new_msgs));
        xml_tag_add_attr(tag, xml_attr_new_int("unread", item->unread_msgs));
        xml_tag_add_attr(tag, xml_attr_new_int("unreadmarked", item->unreadmarked_msgs));
+       xml_tag_add_attr(tag, xml_attr_new_int("marked", item->marked_msgs));
        xml_tag_add_attr(tag, xml_attr_new_int("total", item->total_msgs));
 
        if (item->account)
@@ -820,6 +830,7 @@ struct TotalMsgCount
        guint new_msgs;
        guint unread_msgs;
        guint unreadmarked_msgs;
+       guint marked_msgs;
        guint total_msgs;
 };
 
@@ -870,6 +881,7 @@ static void folder_count_total_msgs_func(FolderItem *item, gpointer data)
        count->new_msgs += item->new_msgs;
        count->unread_msgs += item->unread_msgs;
        count->unreadmarked_msgs += item->unreadmarked_msgs;
+       count->marked_msgs += item->marked_msgs;
        count->total_msgs += item->total_msgs;
 }
 
@@ -980,7 +992,9 @@ gchar *folder_get_status(GPtrArray *folders, gboolean full)
        return ret;
 }
 
-void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs, guint *unreadmarked_msgs, guint *total_msgs)
+void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs, 
+                            guint *unreadmarked_msgs, guint *marked_msgs,
+                            guint *total_msgs)
 {
        struct TotalMsgCount count;
 
@@ -993,6 +1007,7 @@ void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs, guint *unreadm
        *new_msgs = count.new_msgs;
        *unread_msgs = count.unread_msgs;
        *unreadmarked_msgs = count.unreadmarked_msgs;
+       *marked_msgs = count.marked_msgs;
        *total_msgs = count.total_msgs;
 }
 
@@ -1436,6 +1451,8 @@ static gint folder_sort_folder_list(gconstpointer a, gconstpointer b)
 gint folder_item_open(FolderItem *item)
 {
        gchar *buf;
+       g_return_val_if_fail(item->no_select == FALSE, -1);
+
        if((item->folder->klass->scan_required != NULL) &&
           (item->folder->klass->scan_required(item->folder, item))) {
                folder_item_scan_full(item, TRUE);
@@ -1463,6 +1480,7 @@ gint folder_item_close(FolderItem *item)
        Folder *folder;
        
        g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->no_select == FALSE, -1);
 
        if (item->new_msgs) {
                folder_item_update_freeze();
@@ -1496,7 +1514,8 @@ static MsgInfoList *get_msginfos(FolderItem *item, MsgNumberList *numlist)
 {
        MsgInfoList *msglist = NULL;
        Folder *folder = item->folder;
-
+       g_return_val_if_fail(item->no_select == FALSE, NULL);
+       
        if (folder->klass->get_msginfos != NULL)
                msglist = folder->klass->get_msginfos(folder, item, numlist);
        else {
@@ -1542,6 +1561,7 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
                return 0;
        if(item->folder->klass->get_flags == NULL)
                return 0;
+       g_return_val_if_fail(item->no_select == FALSE, 0);
 
        relation = g_relation_new(2);
        g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
@@ -1549,7 +1569,7 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
            item->folder, item, msglist, relation)) == 0) {
                GTuples *tuples;
                MsgInfo *msginfo;
-               MsgPermFlags permflags;
+               MsgPermFlags permflags = 0;
                gboolean skip;
 
                for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
@@ -1583,7 +1603,8 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        GSList *folder_list_cur, *cache_list_cur, *new_list = NULL;
        GSList *exists_list = NULL, *elem;
        GSList *newmsg_list = NULL;
-       guint newcnt = 0, unreadcnt = 0, totalcnt = 0, unreadmarkedcnt = 0;
+       guint newcnt = 0, unreadcnt = 0, totalcnt = 0;
+       guint markedcnt = 0, unreadmarkedcnt = 0;
        guint cache_max_num, folder_max_num, cache_cur_num, folder_cur_num;
        gboolean update_flags = 0, old_uids_valid = FALSE;
     
@@ -1759,10 +1780,19 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        folder_item_update_freeze();
        if (newmsg_list != NULL) {
                GSList *elem;
-
+               int total = g_slist_length(newmsg_list), cur = 0;
+               
+               if ((filtering == TRUE) &&
+                   (item->stype == F_INBOX) &&
+                   (item->folder->account != NULL) && 
+                   (item->folder->account->filter_on_recv)) 
+                       statusbar_print_all(_("Filtering messages...\n"));
+               
                for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem)) {
                        MsgInfo *msginfo = (MsgInfo *) elem->data;
 
+                       statusbar_progress_all(cur++,total, 10);
+
                        msgcache_add_msg(item->cache, msginfo);
                        if ((filtering == TRUE) &&
                            (item->stype == F_INBOX) &&
@@ -1775,6 +1805,8 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                }
                g_slist_free(newmsg_list);
 
+               statusbar_progress_all(0,0,0);
+               statusbar_pop_all();
                update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
        }
 
@@ -1800,6 +1832,9 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                        unreadcnt++;
                if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                        unreadmarkedcnt++;
+               if (MSG_IS_MARKED(msginfo->flags))
+                       markedcnt++;
+
                totalcnt++;
 
                procmsg_msginfo_free(msginfo);
@@ -1810,6 +1845,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        item->unread_msgs = unreadcnt;
        item->total_msgs = totalcnt;
        item->unreadmarked_msgs = unreadmarkedcnt;
+       item->marked_msgs = markedcnt;
 
        update_flags |= F_ITEM_UPDATE_MSGCNT;
 
@@ -1869,7 +1905,8 @@ gint folder_item_syncronize_flags(FolderItem *item)
        g_return_val_if_fail(item != NULL, -1);
        g_return_val_if_fail(item->folder != NULL, -1);
        g_return_val_if_fail(item->folder->klass != NULL, -1);
-       
+       g_return_val_if_fail(item->no_select == FALSE, -1);     
+
        if (item->cache == NULL)
                folder_item_read_cache(item);
        
@@ -1942,7 +1979,7 @@ void folder_clean_cache_memory(void)
                while((listitem != NULL) && (memusage > (prefs_common.cache_max_mem_usage * 1024))) {
                        FolderItem *item = (FolderItem *)(listitem->data);
 
-                       debug_print("Freeing cache memory for %s\n", item->path);
+                       debug_print("Freeing cache memory for %s\n", item->path ? item->path : item->name);
                        memusage -= msgcache_get_memory_usage(item->cache);
                        folder_item_free_cache(item);
                        listitem = listitem->next;
@@ -1963,7 +2000,8 @@ void folder_item_read_cache(FolderItem *item)
                item->cache = msgcache_read_cache(item, cache_file);
                if (!item->cache) {
                        MsgInfoList *list, *cur;
-                       guint newcnt = 0, unreadcnt = 0, unreadmarkedcnt = 0;
+                       guint newcnt = 0, unreadcnt = 0;
+                       guint markedcnt = 0, unreadmarkedcnt = 0;
                        MsgInfo *msginfo;
 
                        item->cache = msgcache_new();
@@ -1981,10 +2019,13 @@ void folder_item_read_cache(FolderItem *item)
                                        unreadcnt++;
                                if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                                        unreadmarkedcnt++;
+                               if (MSG_IS_MARKED(msginfo->flags))
+                                       markedcnt++;
                        }
                        item->new_msgs = newcnt;
                        item->unread_msgs = unreadcnt;
                        item->unreadmarked_msgs = unreadmarkedcnt;
+                       item->marked_msgs = markedcnt;
                        procmsg_msg_list_free(list);
                } else
                        msgcache_read_mark(item->cache, mark_file);
@@ -2035,7 +2076,7 @@ MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
        MsgInfo *msginfo = NULL;
        
        g_return_val_if_fail(item != NULL, NULL);
-       
+       g_return_val_if_fail(item->no_select == FALSE, NULL);   
        folder = item->folder;
        if (!item->cache)
                folder_item_read_cache(item);
@@ -2059,6 +2100,7 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
        
        g_return_val_if_fail(item != NULL, NULL);
        g_return_val_if_fail(msgid != NULL, NULL);
+       g_return_val_if_fail(item->no_select == FALSE, FALSE);
        
        folder = item->folder;
        if (!item->cache)
@@ -2073,6 +2115,7 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
 GSList *folder_item_get_msg_list(FolderItem *item)
 {
        g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(item->no_select == FALSE, FALSE);
        
        if (item->cache == 0)
                folder_item_read_cache(item);
@@ -2082,17 +2125,19 @@ GSList *folder_item_get_msg_list(FolderItem *item)
        return msgcache_get_msg_list(item->cache);
 }
 
-static void msginfo_set_mime_flags(GNode *node, gpointer data)
+void msginfo_set_mime_flags(GNode *node, gpointer data)
 {
        MsgInfo *msginfo = data;
        MimeInfo *mimeinfo = node->data;
-
+       
        if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT) {
                procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
        } else if (mimeinfo->disposition == DISPOSITIONTYPE_UNKNOWN && 
                 mimeinfo->type != MIMETYPE_TEXT &&
                 mimeinfo->type != MIMETYPE_MULTIPART) {
-               procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
+               if (!mimeinfo->subtype 
+               ||  strcmp(mimeinfo->subtype, "pgp-signature"))
+                       procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
        }
 
        /* don't descend below top level message for signed and encrypted info */
@@ -2122,6 +2167,7 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
        folder = item->folder;
 
        g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
+       g_return_val_if_fail(item->no_select == FALSE, NULL);
 
        msgfile = folder->klass->fetch_msg(folder, item, num);
 
@@ -2148,6 +2194,48 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
        return msgfile;
 }
 
+gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
+                                 gboolean body)
+{
+       Folder *folder;
+       gchar *msgfile;
+       MsgInfo *msginfo;
+
+       g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(item->no_select == FALSE, NULL);
+       
+       folder = item->folder;
+
+       if (folder->klass->fetch_msg_full == NULL)
+               return folder_item_fetch_msg(item, num);
+
+       msgfile = folder->klass->fetch_msg_full(folder, item, num, 
+                                               headers, body);
+
+       if (msgfile != NULL) {
+               msginfo = folder_item_get_msginfo(item, num);
+               if ((msginfo != NULL) && !MSG_IS_SCANNED(msginfo->flags)) {
+                       MimeInfo *mimeinfo;
+
+                       if (msginfo->folder->stype != F_QUEUE && 
+                           msginfo->folder->stype != F_DRAFT)
+                               mimeinfo = procmime_scan_file(msgfile);
+                       else
+                               mimeinfo = procmime_scan_queue_file(msgfile);
+                       /* check for attachments */
+                       if (mimeinfo != NULL) { 
+                               g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo);
+                               procmime_mimeinfo_free_all(mimeinfo);
+
+                               procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
+                       }
+               }
+       }
+
+       return msgfile;
+}
+
+
 gint folder_item_fetch_all_msg(FolderItem *item)
 {
        Folder *folder;
@@ -2155,10 +2243,13 @@ gint folder_item_fetch_all_msg(FolderItem *item)
        GSList *cur;
        gint num = 0;
        gint ret = 0;
+       gint total = 0;
 
        g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->no_select == FALSE, -1);
 
        debug_print("fetching all messages in %s ...\n", item->path);
+       statusbar_print_all(_("Fetching all messages in %s ...\n"), item->path);
 
        folder = item->folder;
 
@@ -2168,11 +2259,14 @@ gint folder_item_fetch_all_msg(FolderItem *item)
 
        mlist = folder_item_get_msg_list(item);
 
+       total = g_slist_length(mlist);
+
        for (cur = mlist; cur != NULL; cur = cur->next) {
                MsgInfo *msginfo = (MsgInfo *)cur->data;
                gchar *msg;
 
-               num++;
+               statusbar_progress_all(num++,total, 10);
+
                if (folder->ui_func)
                        folder->ui_func(folder, item,
                                        folder->ui_func_data ?
@@ -2188,7 +2282,9 @@ gint folder_item_fetch_all_msg(FolderItem *item)
                }
                g_free(msg);
        }
-
+       
+       statusbar_progress_all(0,0,0);
+       statusbar_pop_all();
        procmsg_msg_list_free(mlist);
 
        return ret;
@@ -2277,6 +2373,8 @@ static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo
                item->unread_msgs++;
        if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
                item->unreadmarked_msgs++;
+       if (MSG_IS_MARKED(newmsginfo->flags))
+               item->marked_msgs++;
        item->total_msgs++;
 
        folder_item_update_freeze();
@@ -2299,6 +2397,9 @@ static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
                msginfo->folder->unread_msgs--;
        if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                msginfo->folder->unreadmarked_msgs--;
+       if (MSG_IS_MARKED(msginfo->flags))
+               item->marked_msgs--;
+
        msginfo->folder->total_msgs--;
 
        msginfo_update.msginfo = msginfo;
@@ -2340,6 +2441,7 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
         g_return_val_if_fail(dest != NULL, -1);
         g_return_val_if_fail(file_list != NULL, -1);
         g_return_val_if_fail(dest->folder != NULL, -1);
+       g_return_val_if_fail(dest->no_select == FALSE, -1);
 
         folder = dest->folder;
 
@@ -2410,25 +2512,6 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
 
         return lastnum;
 }
-
-/*
-gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
-{
-       Folder *folder;
-       gint num;
-
-       g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msginfo != NULL, -1);
-
-       folder = dest->folder;
-       if (dest->last_num < 0) folder->scan(folder, dest);
-
-       num = folder->move_msg(folder, dest, msginfo);
-       if (num > 0) dest->last_num = num;
-
-       return num;
-}
-*/
                
 FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest) 
 {
@@ -2439,7 +2522,7 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
        gchar *old_id, *new_id;
 
        mlist = folder_item_get_msg_list(src);
-
+       
        /* move messages */
        debug_print("Moving %s to %s\n", src->path, dest->path);
        new_item = folder_create_folder(dest, src->name);
@@ -2508,7 +2591,7 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
                if (tmp == src) {
                        return F_MOVE_FAILED_DEST_IS_CHILD;
                }
-               tmp = folder_item_parent(tmp);;
+               tmp = folder_item_parent(tmp);
        }
        
        tmp = folder_item_parent(src);
@@ -2568,6 +2651,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        gint num, lastnum = -1;
        gboolean folderscan = FALSE;
        GRelation *relation;
+       GSList *not_moved = NULL;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
@@ -2575,6 +2659,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        folder = dest->folder;
 
        g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
+       g_return_val_if_fail(dest->no_select == FALSE, -1);
 
        relation = g_relation_new(2);
        g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
@@ -2605,7 +2690,10 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                        MsgInfo * msginfo = (MsgInfo *) l->data;
 
                        num = folder->klass->copy_msg(folder, dest, msginfo);
-                       g_relation_insert(relation, msginfo, GINT_TO_POINTER(num));
+                       if (num > 0)
+                               g_relation_insert(relation, msginfo, GINT_TO_POINTER(num));
+                       else
+                               not_moved = g_slist_prepend(not_moved, msginfo);
                }
        }
 
@@ -2664,22 +2752,34 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        }
 
        if (remove_source) {
+               MsgInfo *msginfo = (MsgInfo *) msglist->data;
+               FolderItem *item = msginfo->folder;
                /*
                 * Remove source messages from their folders if
                 * copying was successfull and update folder
                 * message counts
                 */
+               if (item->folder->klass->remove_msgs) {
+                       item->folder->klass->remove_msgs(item->folder,
+                                                               msginfo->folder,
+                                                               msglist,
+                                                               relation);
+               }
                for (l = msglist; l != NULL; l = g_slist_next(l)) {
-                       MsgInfo *msginfo = (MsgInfo *) l->data;
-                       FolderItem *item = msginfo->folder;
                        GTuples *tuples;
+                       msginfo = (MsgInfo *) l->data;
+                       item = msginfo->folder;
 
                        tuples = g_relation_select(relation, msginfo, 0);
                        num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
                        g_tuples_destroy(tuples);
 
+                       if (g_slist_find(not_moved, msginfo))
+                               continue;
+
                        if ((num >= 0) && (item->folder->klass->remove_msg != NULL)) {
-                               item->folder->klass->remove_msg(item->folder,
+                               if (!item->folder->klass->remove_msgs)
+                                       item->folder->klass->remove_msg(item->folder,
                                                                msginfo->folder,
                                                                msginfo->msgnum);
                                remove_msginfo_from_cache(item, msginfo);
@@ -2718,10 +2818,13 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
  */
 gint folder_item_move_msgs(FolderItem *dest, GSList *msglist)
 {
+       gint result = -1;
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
-
-       return do_copy_msgs(dest, msglist, TRUE);
+       inc_lock();
+       result = do_copy_msgs(dest, msglist, TRUE);
+       inc_unlock();
+       return result;
 }
 
 /**
@@ -2739,7 +2842,7 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
     
        list.data = msginfo;
        list.next = NULL;
-       
+
        return do_copy_msgs(dest, &list, FALSE);
 }
 
@@ -2751,10 +2854,15 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
  */
 gint folder_item_copy_msgs(FolderItem *dest, GSList *msglist)
 {
+       gint result;
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
 
-       return do_copy_msgs(dest, msglist, FALSE);
+       inc_lock();
+       result = do_copy_msgs(dest, msglist, FALSE);
+       inc_unlock();
+       
+       return result;
 }
 
 gint folder_item_remove_msg(FolderItem *item, gint num)
@@ -2766,6 +2874,7 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
        g_return_val_if_fail(item != NULL, -1);
        folder = item->folder;
        g_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
+       g_return_val_if_fail(item->no_select == FALSE, -1);
 
        if (!item->cache) folder_item_read_cache(item);
 
@@ -2788,20 +2897,32 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
        g_return_val_if_fail(item != NULL, -1);
        folder = item->folder;
        g_return_val_if_fail(folder != NULL, -1);
-
+       g_return_val_if_fail(item->no_select == FALSE, -1);
+       inc_lock();
        if (!item->cache) folder_item_read_cache(item);
 
        folder_item_update_freeze();
-       while (msglist != NULL) {
+       if (item->folder->klass->remove_msgs) {
+               ret = item->folder->klass->remove_msgs(item->folder,
+                                                       item,
+                                                       msglist,
+                                                       NULL);
+       }
+       while (ret == 0 && msglist != NULL) {
                MsgInfo *msginfo = (MsgInfo *)msglist->data;
-
-               ret = folder_item_remove_msg(item, msginfo->msgnum);
+               if (MSG_IS_LOCKED(msginfo->flags)) {
+                       msglist = msglist->next;
+                       continue;
+               }
+               if (!item->folder->klass->remove_msgs)
+                       ret = folder_item_remove_msg(item, msginfo->msgnum);
                if (ret != 0) break;
                msgcache_remove_msg(item->cache, msginfo->msgnum);
                msglist = msglist->next;
        }
+       folder_item_scan_full(item, FALSE);
        folder_item_update_thaw();
-
+       inc_unlock();
        return ret;
 }
 
@@ -2811,9 +2932,11 @@ gint folder_item_remove_all_msg(FolderItem *item)
        gint result;
 
        g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->no_select == FALSE, -1);
 
        folder = item->folder;
 
+       inc_lock();
        if (folder->klass->remove_all_msg != NULL) {
                result = folder->klass->remove_all_msg(folder, item);
 
@@ -2833,10 +2956,12 @@ gint folder_item_remove_all_msg(FolderItem *item)
                item->new_msgs = 0;
                item->unread_msgs = 0;
                item->unreadmarked_msgs = 0;
+               item->marked_msgs = 0;
                item->total_msgs = 0;
                folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
        }
 
+       inc_unlock();
        return result;
 }
 
@@ -2844,6 +2969,7 @@ void folder_item_change_msg_flags(FolderItem *item, MsgInfo *msginfo, MsgPermFla
 {
        g_return_if_fail(item != NULL);
        g_return_if_fail(msginfo != NULL);
+       g_return_if_fail(item->no_select == FALSE);
        
        if (item->folder->klass->change_flags != NULL) {
                item->folder->klass->change_flags(item->folder, item, msginfo, newflags);
@@ -2857,6 +2983,7 @@ gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
        Folder *folder;
 
        g_return_val_if_fail(item != NULL, FALSE);
+       g_return_val_if_fail(item->no_select == FALSE, FALSE);
 
        folder = item->folder;
 
@@ -3279,14 +3406,17 @@ void folder_item_apply_processing(FolderItem *item)
 {
        GSList *processing_list;
        GSList *mlist, *cur;
-       
+       guint total = 0, curmsg = 0;
+
        g_return_if_fail(item != NULL);
-       
+       g_return_if_fail(item->no_select == FALSE);     
        processing_list = item->prefs->processing;
 
        folder_item_update_freeze();
 
        mlist = folder_item_get_msg_list(item);
+       total = g_slist_length(mlist);
+       statusbar_print_all(_("Processing messages..."));
        for (cur = mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo;
 
@@ -3295,7 +3425,9 @@ void folder_item_apply_processing(FolderItem *item)
                 /* reset parameters that can be modified by processing */
                 msginfo->hidden = 0;
                 msginfo->score = 0;
-                
+
+               statusbar_progress_all(curmsg++,total, 10);
+
                 /* apply pre global rules */
                filter_message_by_msginfo(pre_global_processing, msginfo);
                 
@@ -3308,6 +3440,9 @@ void folder_item_apply_processing(FolderItem *item)
                procmsg_msginfo_free(msginfo);
        }
        g_slist_free(mlist);
+       
+       statusbar_progress_all(0,0,0);
+       statusbar_pop_all();
 
        folder_item_update_thaw();
 }
@@ -3390,4 +3525,11 @@ void folder_item_update_thaw(void)
        }
 }
 
+void folder_item_set_batch (FolderItem *item, gboolean batch)
+{
+       if (item->folder->klass->set_batch) {
+               item->folder->klass->set_batch(item->folder, item, batch);
+       }
+}
+
 #undef PUT_ESCAPE_STR