0.8.8claws63
[claws.git] / src / folder.c
index 4f099117253cf81f0792e45a794fb7176bab6406..bfac64ba4f6c1969168a1ad7d280aa5710865d30 100644 (file)
 #include "utils.h"
 #include "xml.h"
 #include "codeconv.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
 #include "account.h"
 #include "filtering.h"
 #include "scoring.h"
 #include "prefs_folder_item.h"
 #include "procheader.h"
-#include "statusbar.h"
+#include "hooks.h"
+#include "log.h"
 
 /* Dependecies to be removed ?! */
 #include "prefs_common.h"
@@ -123,8 +124,8 @@ static void folder_init(Folder *folder, const gchar *name)
        folder->item_new = NULL;
        folder->item_destroy = NULL;
        folder->fetch_msg = NULL;
-       folder->fetch_msginfo = NULL;
-       folder->fetch_msginfos = NULL;
+       folder->get_msginfo = NULL;
+       folder->get_msginfos = NULL;
        folder->get_num_list = NULL;
        folder->ui_func = NULL;
        folder->ui_func_data = NULL;
@@ -207,6 +208,7 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
        item->mtime = 0;
        item->new = 0;
        item->unread = 0;
+       item->unreadmarked = 0;
        item->total = 0;
        item->last_num = -1;
        item->cache = NULL;
@@ -415,7 +417,7 @@ void folder_write_list(void)
 
        fputs("</folderlist>\n", pfile->fp);
 
-       if (prefs_write_close(pfile) < 0)
+       if (prefs_file_close(pfile) < 0)
                g_warning("failed to write folder list.\n");
 }
 
@@ -464,6 +466,7 @@ struct TotalMsgCount
 {
        guint new;
        guint unread;
+       guint unreadmarked;
        guint total;
 };
 
@@ -513,14 +516,15 @@ static void folder_count_total_msgs_func(FolderItem *item, gpointer data)
 
        count->new += item->new;
        count->unread += item->unread;
+       count->unreadmarked += item->unreadmarked;
        count->total += item->total;
 }
 
-void folder_count_total_msgs(guint *new, guint *unread, guint *total)
+void folder_count_total_msgs(guint *new, guint *unread, guint *unreadmarked, guint *total)
 {
        struct TotalMsgCount count;
 
-       count.new = count.unread = count.total = 0;
+       count.new = count.unread = count.unreadmarked = count.total = 0;
 
        debug_print("Counting total number of messages...\n");
 
@@ -528,6 +532,7 @@ void folder_count_total_msgs(guint *new, guint *unread, guint *total)
 
        *new = count.new;
        *unread = count.unread;
+       *unreadmarked = count.unreadmarked;
        *total = count.total;
 }
 
@@ -984,17 +989,16 @@ void folder_item_close(FolderItem *item)
 
        folder_item_write_cache(item);
        
-       folder_update_item(item, FALSE);
-
+       folder_item_update(item, F_ITEM_UPDATE_MSGCNT);
 }
 
 gint folder_item_scan(FolderItem *item)
 {
        Folder *folder;
        GSList *folder_list = NULL, *cache_list = NULL, *folder_list_cur, *cache_list_cur, *new_list = NULL;
-       guint newcnt = 0, unreadcnt = 0, totalcnt = 0;
+       guint newcnt = 0, unreadcnt = 0, totalcnt = 0, unreadmarkedcnt = 0;
        guint cache_max_num, folder_max_num, cache_cur_num, folder_cur_num;
-       gboolean contentchange = FALSE;
+       gboolean update_flags = 0;
     
        g_return_val_if_fail(item != NULL, -1);
        if (item->path == NULL) return -1;
@@ -1094,8 +1098,6 @@ gint folder_item_scan(FolderItem *item)
                        else
                                folder_cur_num = G_MAXINT;
 
-                       contentchange = TRUE;
-
                        continue;
                }
 
@@ -1115,7 +1117,7 @@ gint folder_item_scan(FolderItem *item)
                        else
                                cache_cur_num = G_MAXINT;
 
-                       contentchange = TRUE;
+                       update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
 
                        continue;
                }
@@ -1133,12 +1135,16 @@ gint folder_item_scan(FolderItem *item)
 
                                msgcache_remove_msg(item->cache, msginfo->msgnum);
 
-                               if (NULL != (newmsginfo = folder->fetch_msginfo(folder, item, folder_cur_num))) {
+                               if (NULL != (newmsginfo = folder->get_msginfo(folder, item, folder_cur_num))) {
                                        msgcache_add_msg(item->cache, newmsginfo);
                                        if (MSG_IS_NEW(newmsginfo->flags) && !MSG_IS_IGNORE_THREAD(newmsginfo->flags))
                                                newcnt++;
                                        if (MSG_IS_UNREAD(newmsginfo->flags) && !MSG_IS_IGNORE_THREAD(newmsginfo->flags))
                                                unreadcnt++;
+                                       if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+                                               unreadmarkedcnt++;
+                                       if (procmsg_msg_has_flagged_parent(newmsginfo, MSG_IGNORE_THREAD))
+                                               procmsg_msginfo_set_flags(newmsginfo, MSG_IGNORE_THREAD, 0);
                                        procmsg_msginfo_free(newmsginfo);
                                }                                       
 
@@ -1148,6 +1154,10 @@ gint folder_item_scan(FolderItem *item)
                                        newcnt++;
                                if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                                        unreadcnt++;
+                               if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+                                       unreadmarkedcnt++;
+                               if (!MSG_IS_IGNORE_THREAD(msginfo->flags) && procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD))
+                                       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
                        }
                        totalcnt++;
                        procmsg_msginfo_free(msginfo);
@@ -1166,7 +1176,7 @@ gint folder_item_scan(FolderItem *item)
                        else
                                folder_cur_num = G_MAXINT;
 
-                       contentchange = TRUE;
+                       update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
 
                        continue;
                }
@@ -1179,13 +1189,13 @@ gint folder_item_scan(FolderItem *item)
        g_slist_free(cache_list);
        g_slist_free(folder_list);
 
-       if (folder->fetch_msginfos) {
+       if (folder->get_msginfos) {
                GSList *elem;
                GSList *newmsg_list;
                MsgInfo *msginfo;
                
                if (new_list) {
-                       newmsg_list = folder->fetch_msginfos(folder, item, new_list);
+                       newmsg_list = folder->get_msginfos(folder, item, new_list);
                        for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem)) {
                                msginfo = (MsgInfo *) elem->data;
                                msgcache_add_msg(item->cache, msginfo);
@@ -1193,12 +1203,18 @@ gint folder_item_scan(FolderItem *item)
                                        newcnt++;
                                if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                                        unreadcnt++;
+                               if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+                                       unreadmarkedcnt++;
+                               if (procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD))
+                                       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
                                totalcnt++;
                                procmsg_msginfo_free(msginfo);
+
+                               update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
                        }
                        g_slist_free(newmsg_list);
                }
-       } else if (folder->fetch_msginfo) {
+       } else if (folder->get_msginfo) {
                GSList *elem;
        
                for (elem = new_list; elem != NULL; elem = g_slist_next(elem)) {
@@ -1206,27 +1222,33 @@ gint folder_item_scan(FolderItem *item)
                        guint num;
 
                        num = GPOINTER_TO_INT(elem->data);
-                       msginfo = folder->fetch_msginfo(folder, item, num);
+                       msginfo = folder->get_msginfo(folder, item, num);
                        if (msginfo != NULL) {
                                msgcache_add_msg(item->cache, msginfo);
                                if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                                    newcnt++;
                                if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                                    unreadcnt++;
+                               if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+                                       unreadmarkedcnt++;
+                               if (procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD))
+                                       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
                                totalcnt++;
                                procmsg_msginfo_free(msginfo);
                                debug_print("Added newly found message %d to cache.\n", num);
                        }
+
+                       update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
                }
        }
 
        item->new = newcnt;
        item->unread = unreadcnt;
        item->total = totalcnt;
-       
+       item->unreadmarked = unreadmarkedcnt;
        g_slist_free(new_list);
 
-       folder_update_item(item, contentchange);
+       folder_item_update(item, update_flags);
 
        return 0;
 }
@@ -1371,7 +1393,7 @@ void folder_item_write_cache(FolderItem *item)
        g_free(mark_file);
 }
 
-MsgInfo *folder_item_fetch_msginfo(FolderItem *item, gint num)
+MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
 {
        Folder *folder;
        MsgInfo *msginfo;
@@ -1385,8 +1407,8 @@ MsgInfo *folder_item_fetch_msginfo(FolderItem *item, gint num)
        if ((msginfo = msgcache_get_msg(item->cache, num)) != NULL)
                return msginfo;
        
-       g_return_val_if_fail(folder->fetch_msginfo, NULL);
-       if ((msginfo = folder->fetch_msginfo(folder, item, num)) != NULL) {
+       g_return_val_if_fail(folder->get_msginfo, NULL);
+       if ((msginfo = folder->get_msginfo(folder, item, num)) != NULL) {
                msgcache_add_msg(item->cache, msginfo);
                return msginfo;
        }
@@ -1394,7 +1416,7 @@ MsgInfo *folder_item_fetch_msginfo(FolderItem *item, gint num)
        return NULL;
 }
 
-MsgInfo *folder_item_fetch_msginfo_by_id(FolderItem *item, const gchar *msgid)
+MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
 {
        Folder *folder;
        MsgInfo *msginfo;
@@ -1456,15 +1478,19 @@ gint folder_item_add_msg(FolderItem *dest, const gchar *file,
        num = folder->add_msg(folder, dest, file, remove_source);
 
         if (num > 0) {
-               msginfo = folder->fetch_msginfo(folder, dest, num);
+               msginfo = folder->get_msginfo(folder, dest, num);
 
                if (msginfo != NULL) {
                        if (MSG_IS_NEW(msginfo->flags))
                                dest->new++;
                        if (MSG_IS_UNREAD(msginfo->flags))
                                dest->unread++;
+                       if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+                               dest->unreadmarked++;
+                       if (procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD))
+                               procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
                        dest->total++;
-                       dest->need_update = TRUE;
+                       folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
 
                        msgcache_add_msg(dest->cache, msginfo);
 
@@ -1504,6 +1530,8 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
        FolderItem *next_item;
        GNode *srcnode;
        int cnt = 0;
+       gchar *old_id, *new_id;
+
        mlist = folder_item_get_msg_list(src);
 
        /* move messages */
@@ -1514,8 +1542,6 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
                return NULL;
        }
        
-       statusbar_print_all(_("Moving %s to %s..."), src->name, new_item->path);
-
        if (new_item->folder == NULL)
                new_item->folder = dest->folder;
 
@@ -1524,13 +1550,13 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
                MsgInfo * msginfo;
                cnt++;
                if (cnt%500)
-                       statusbar_print_all(_("Moving %s to %s (%d%%)..."), src->name, 
+                       log_message(_("Moving %s to %s (%d%%)...\n"), src->name, 
                                        new_item->path,
                                        100*cnt/g_slist_length(mlist));
                msginfo = (MsgInfo *) cur->data;
                folder_item_move_msg(new_item, msginfo);
-               if (cnt%500)
-                       statusbar_pop_all();
+
+               procmsg_msginfo_free(msginfo);
        }
        
        /*copy prefs*/
@@ -1551,25 +1577,36 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
        while (srcnode != NULL) {
                if (srcnode && srcnode->data) {
                        next_item = (FolderItem*) srcnode->data;
+                       srcnode = srcnode->next;
                        if (folder_item_move_recursive(next_item, new_item) == NULL)
                                return NULL;
                }
-               srcnode = srcnode->next;
        }
+       old_id = folder_item_get_identifier(src);
+       new_id = folder_item_get_identifier(new_item);
+       debug_print("updating rules : %s => %s\n", old_id, new_id);
+       
+       src->folder->remove_folder(src->folder, src);
+       folder_write_list();
+
+       if (old_id != NULL && new_id != NULL)
+               prefs_filtering_rename_path(old_id, new_id);
+       g_free(old_id);
+       g_free(new_id);
+
        return new_item;
 }
 
-FolderItem *folder_item_move_to(FolderItem *src, FolderItem *dest, char *error)
+gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_item)
 {
        FolderItem *tmp = dest->parent;
-       char * src_identifier, * dst_identifier, * new_identifier;
-       char * phys_srcpath, * phys_dstpath;
+       gchar * src_identifier, * dst_identifier;
+       gchar * phys_srcpath, * phys_dstpath;
        GNode *src_node;
        
        while (tmp) {
                if (tmp == src) {
-                       error = g_strdup(_("Can't move a folder to one of its children."));
-                       return NULL;
+                       return F_MOVE_FAILED_DEST_IS_CHILD;
                }
                tmp = tmp->parent;
        }
@@ -1585,28 +1622,29 @@ FolderItem *folder_item_move_to(FolderItem *src, FolderItem *dest, char *error)
        }
        if (src_identifier == NULL || dst_identifier == NULL) {
                printf("Can't get identifiers\n");
-               return NULL;
+               return F_MOVE_FAILED;
+       }
+
+       if (src->folder != dest->folder) {
+               return F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX;
        }
 
        phys_srcpath = folder_item_get_path(src);
        phys_dstpath = g_strconcat(folder_item_get_path(dest),G_DIR_SEPARATOR_S,g_basename(phys_srcpath),NULL);
 
-       if (src->parent == dest) {
-               error = g_strdup(_("Source and destination are the same."));
+       if (src->parent == dest || src == dest) {
                g_free(src_identifier);
                g_free(dst_identifier);
                g_free(phys_srcpath);
                g_free(phys_dstpath);
-               return NULL;
+               return F_MOVE_FAILED_DEST_IS_PARENT;
        }
        debug_print("moving \"%s\" to \"%s\"\n", phys_srcpath, phys_dstpath);
        if ((tmp = folder_item_move_recursive(src, dest)) == NULL) {
-               error = g_strdup(_("Move failed!"));
-               return NULL;
+               return F_MOVE_FAILED;
        }
        
        /* update rules */
-       src->folder->remove_folder(src->folder, src);
        src_node = g_node_find(src->folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, src);
        if (src_node) 
                g_node_destroy(src_node);
@@ -1614,19 +1652,14 @@ FolderItem *folder_item_move_to(FolderItem *src, FolderItem *dest, char *error)
                debug_print("can't remove node: it's null!\n");
        /* not to much worry if remove fails, move has been done */
        
-       debug_print("updating rules ....\n");
-       new_identifier = g_strconcat(dst_identifier, G_DIR_SEPARATOR_S, g_basename(phys_srcpath), NULL);
-       prefs_filtering_rename_path(src_identifier, new_identifier);
-
-       folder_write_list();
-
        g_free(src_identifier);
        g_free(dst_identifier);
-       g_free(new_identifier);
        g_free(phys_srcpath);
        g_free(phys_dstpath);
 
-       return tmp;
+       *new_item = tmp;
+
+       return F_MOVE_OK;
 }
 
 gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
@@ -1653,7 +1686,7 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
                MsgInfo *newmsginfo;
     
                /* Add new msginfo to dest folder */
-               if (NULL != (newmsginfo = folder->fetch_msginfo(folder, dest, num))) {
+               if (NULL != (newmsginfo = folder->get_msginfo(folder, dest, num))) {
                        newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
                        
                        if (dest->stype == F_OUTBOX || dest->stype == F_QUEUE  ||
@@ -1666,8 +1699,12 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
                                dest->new++;
                        if (MSG_IS_UNREAD(newmsginfo->flags))
                                dest->unread++;
+                       if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+                               dest->unreadmarked++;
+                       if (procmsg_msg_has_flagged_parent(newmsginfo, MSG_IGNORE_THREAD))
+                               procmsg_msginfo_set_flags(newmsginfo, MSG_IGNORE_THREAD, 0);
                        dest->total++;
-                       dest->need_update = TRUE;
+                       folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
 
                        procmsg_msginfo_free(newmsginfo);
                }
@@ -1682,8 +1719,10 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
                                msginfo->folder->new--;
                        if (MSG_IS_UNREAD(msginfo->flags))
                                msginfo->folder->unread--;
+                       if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+                               msginfo->folder->unreadmarked--;
                        msginfo->folder->total--;
-                       msginfo->folder->need_update = TRUE;
+                       folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
                }
        }
        
@@ -1760,7 +1799,7 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
                if (num != -1) {
                        MsgInfo *newmsginfo;
 
-                       newmsginfo = folder->fetch_msginfo(folder, dest, num);
+                       newmsginfo = folder->get_msginfo(folder, dest, num);
                        if (newmsginfo) {
                                newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
                                if (dest->stype == F_OUTBOX ||
@@ -1775,8 +1814,12 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
                                        dest->new++;
                                if (MSG_IS_UNREAD(newmsginfo->flags))
                                        dest->unread++;
+                               if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+                                       dest->unreadmarked++;
+                               if (procmsg_msg_has_flagged_parent(newmsginfo, MSG_IGNORE_THREAD))
+                                       procmsg_msginfo_set_flags(newmsginfo, MSG_IGNORE_THREAD, 0);
                                dest->total++;
-                               dest->need_update = TRUE;
+                               folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
 
                                procmsg_msginfo_free(newmsginfo);
                        }
@@ -1807,8 +1850,10 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
                                msginfo->folder->new--;
                        if (MSG_IS_UNREAD(msginfo->flags))
                                msginfo->folder->unread--;
+                       if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+                               msginfo->folder->unreadmarked--;
                        msginfo->folder->total--;                       
-                       msginfo->folder->need_update = TRUE;
+                       folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
                }
 
                l2 = g_slist_next(l2);
@@ -1859,7 +1904,7 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
        if (num != -1) {
                MsgInfo *newmsginfo;
 
-               if (NULL != (newmsginfo = folder->fetch_msginfo(folder, dest, num))) {
+               if (NULL != (newmsginfo = folder->get_msginfo(folder, dest, num))) {
                        newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
                        if (dest->stype == F_OUTBOX ||
                            dest->stype == F_QUEUE  ||
@@ -1873,8 +1918,12 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
                                dest->new++;
                        if (MSG_IS_UNREAD(newmsginfo->flags))
                                dest->unread++;
+                       if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+                               dest->unreadmarked++;
+                       if (procmsg_msg_has_flagged_parent(newmsginfo, MSG_IGNORE_THREAD))
+                               procmsg_msginfo_set_flags(newmsginfo, MSG_IGNORE_THREAD, 0);
                        dest->total++;
-                       dest->need_update = TRUE;
+                       folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
 
                        procmsg_msginfo_free(newmsginfo);
                }                       
@@ -1947,7 +1996,7 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
                if (num != -1) {
                        MsgInfo *newmsginfo;
 
-                       newmsginfo = folder->fetch_msginfo(folder, dest, num);
+                       newmsginfo = folder->get_msginfo(folder, dest, num);
                        if (newmsginfo) {
                                newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
                                if (dest->stype == F_OUTBOX ||
@@ -1962,8 +2011,12 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
                                        dest->new++;
                                if (MSG_IS_UNREAD(newmsginfo->flags))
                                        dest->unread++;
+                               if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+                                       dest->unreadmarked++;
+                               if (procmsg_msg_has_flagged_parent(newmsginfo, MSG_IGNORE_THREAD))
+                                       procmsg_msginfo_set_flags(newmsginfo, MSG_IGNORE_THREAD, 0);
                                dest->total++;
-                               dest->need_update = TRUE;
+                               folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
 
                                procmsg_msginfo_free(newmsginfo);
                        }
@@ -1997,11 +2050,13 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
                        item->new--;
                if (MSG_IS_UNREAD(msginfo->flags))
                        item->unread--;
+               if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+                       item->unreadmarked--;
                procmsg_msginfo_free(msginfo);
                msgcache_remove_msg(item->cache, num);
        }
        item->total--;
-       item->need_update = TRUE;
+       folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
 
        return ret;
 }
@@ -2058,8 +2113,9 @@ gint folder_item_remove_all_msg(FolderItem *item)
 
                item->new = 0;
                item->unread = 0;
+               item->unreadmarked = 0;
                item->total = 0;
-               item->need_update = TRUE;
+               folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
        }
 
        return result;
@@ -2129,7 +2185,7 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        gboolean ret_rcpt = FALSE, hidereadmsgs = FALSE; /* CLAWS */
        FolderSortKey sort_key = SORT_BY_NONE;
        FolderSortType sort_type = SORT_ASCENDING;
-       gint new = 0, unread = 0, total = 0;
+       gint new = 0, unread = 0, total = 0, unreadmarked = 0;
        time_t mtime = 0;
 
        g_return_val_if_fail(node->data != NULL, FALSE);
@@ -2169,6 +2225,8 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
                        new = atoi(attr->value);
                else if (!strcmp(attr->name, "unread"))
                        unread = atoi(attr->value);
+               else if (!strcmp(attr->name, "unreadmarked"))
+                       unreadmarked = atoi(attr->value);
                else if (!strcmp(attr->name, "total"))
                        total = atoi(attr->value);
                else if (!strcmp(attr->name, "no_sub"))
@@ -2206,6 +2264,8 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
                                sort_key = SORT_BY_UNREAD;
                        else if (!strcmp(attr->value, "mime"))
                                sort_key = SORT_BY_MIME;
+                       else if (!strcmp(attr->value, "to"))
+                               sort_key = SORT_BY_TO;
                        else if (!strcmp(attr->value, "locked"))
                                sort_key = SORT_BY_LOCKED;
                } else if (!strcmp(attr->name, "sort_type")) {
@@ -2226,6 +2286,7 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        item->mtime = mtime;
        item->new = new;
        item->unread = unread;
+       item->unreadmarked = unreadmarked;
        item->total = total;
        item->no_sub = no_sub;
        item->no_select = no_select;
@@ -2360,7 +2421,8 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                                                 "draft", "queue", "trash"};
        static gchar *sort_key_str[] = {"none", "number", "size", "date",
                                        "from", "subject", "score", "label",
-                                       "mark", "unread", "mime", "locked" };
+                                       "mark", "unread", "mime", "to", 
+                                       "locked"};
        g_return_if_fail(node != NULL);
        g_return_if_fail(fp != NULL);
 
@@ -2423,8 +2485,8 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                }
 
                fprintf(fp,
-                       " mtime=\"%lu\" new=\"%d\" unread=\"%d\" total=\"%d\"",
-                       item->mtime, item->new, item->unread, item->total);
+                       " mtime=\"%lu\" new=\"%d\" unread=\"%d\" unreadmarked=\"%d\" total=\"%d\"",
+                       item->mtime, item->new, item->unread, item->unreadmarked, item->total);
 
                if (item->account)
                        fprintf(fp, " account_id=\"%d\"",
@@ -2460,7 +2522,7 @@ static void folder_update_op_count_rec(GNode *node)
        if (g_node_depth(node) > 0) {
                if (fitem->op_count > 0) {
                        fitem->op_count = 0;
-                       folder_update_item(fitem, FALSE);
+                       folder_item_update(fitem, F_ITEM_UPDATE_MSGCNT);
                }
                if (node->children) {
                        GNode *child;
@@ -2671,8 +2733,9 @@ void folder_item_apply_processing(FolderItem *item)
        if (processing_list == NULL)
                return;
 
+       folder_item_update_freeze();
+
        mlist = folder_item_get_msg_list(item);
-       
        for (cur = mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo;
 
@@ -2680,104 +2743,80 @@ void folder_item_apply_processing(FolderItem *item)
                filter_message_by_msginfo(processing_list, msginfo);
                procmsg_msginfo_free(msginfo);
        }
-       
-       folder_update_items_when_required(FALSE);
-
        g_slist_free(mlist);
+
+       folder_item_update_thaw();
 }
 
 /*
- *  Callback handling for FolderItem content changes
+ *  functions for handling FolderItem content changes
  */
-GSList *folder_item_update_callbacks_list = NULL;
-gint   folder_item_update_callbacks_nextid = 0;
+static gint folder_item_update_freeze_cnt = 0;
 
-struct FolderItemUpdateCallback
-{
-       gint                    id;
-       FolderItemUpdateFunc    func;
-       gpointer                data;
-};
-
-gint folder_item_update_callback_register(FolderItemUpdateFunc func, gpointer data)
+/**
+ * Notify the folder system about changes to a folder. If the
+ * update system is not frozen the FOLDER_ITEM_UPDATE_HOOKLIST will
+ * be invoked, otherwise the changes will be remebered until
+ * the folder system is thawed.
+ *
+ * \param item The FolderItem that was changed
+ * \param update_flags Type of changed that was made
+ */
+void folder_item_update(FolderItem *item, FolderItemUpdateFlags update_flags)
 {
-       struct FolderItemUpdateCallback *callback;
-
-       g_return_val_if_fail(func != NULL, -1);
-
-       folder_item_update_callbacks_nextid++;
-
-       callback = g_new0(struct FolderItemUpdateCallback, 1);
-       callback->id = folder_item_update_callbacks_nextid;
-       callback->func = func;
-       callback->data = data;
-
-       folder_item_update_callbacks_list =
-               g_slist_append(folder_item_update_callbacks_list, callback);
-
-       return folder_item_update_callbacks_nextid;
+       if (folder_item_update_freeze_cnt == 0) {
+               FolderItemUpdateData source;
+       
+               source.item = item;
+               source.update_flags = update_flags;
+               hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
+       } else {
+               item->update_flags |= update_flags;
+       }
 }
 
-void folder_item_update_callback_unregister(gint id)
+void folder_item_update_recursive(FolderItem *item, FolderItemUpdateFlags update_flags)
 {
-       GSList *list, *next;
+       GNode *node = item->folder->node;       
 
-       for (list = folder_item_update_callbacks_list; list != NULL; list = next) {
-               struct FolderItemUpdateCallback *callback;
+       node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+       node = node->children;
 
-               next = list->next;
+       folder_item_update(item, update_flags);
+       while (node != NULL) {
+               if (node && node->data) {
+                       FolderItem *next_item = (FolderItem*) node->data;
 
-               callback = list->data;
-               if (callback->id == id) {
-                       folder_item_update_callbacks_list =
-                               g_slist_remove(folder_item_update_callbacks_list, callback);
-                       g_free(callback);
+                       folder_item_update(next_item, update_flags);
                }
+               node = node->next;
        }
 }
 
-static void folder_item_update_callback_execute(FolderItem *item, gboolean contentchange)
-{
-       GSList *list;
-
-       for (list = folder_item_update_callbacks_list; list != NULL; list = list->next) {
-               struct FolderItemUpdateCallback *callback;
-
-               callback = list->data;
-               callback->func(item, contentchange, callback->data);
-       }
-}
-
-void folder_update_item(FolderItem *item, gboolean contentchange)
+void folder_item_update_freeze()
 {
-       folder_item_update_callback_execute(item, contentchange);
+       folder_item_update_freeze_cnt++;
 }
 
-static void folder_update_item_func(FolderItem *item, gpointer contentchange)
+static void folder_item_update_func(FolderItem *item, gpointer data)
 {
-       if (item->need_update) {
-               folder_item_update_callback_execute(item, GPOINTER_TO_INT(contentchange));
-               item->need_update = FALSE;
+       FolderItemUpdateData source;
+    
+       if (item->update_flags) {
+               source.item = item;
+               source.update_flags = item->update_flags;
+               hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);                             
+               item->update_flags = 0;
        }
 }
 
-void folder_update_items_when_required(gboolean contentchange)
-{
-       folder_func_to_all_folders(folder_update_item_func, GINT_TO_POINTER(contentchange));
-}
-
-void folder_update_item_recursive(FolderItem *item, gboolean update_summary)
+void folder_item_update_thaw()
 {
-       GNode *node = item->folder->node;       
-       node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
-       node = node->children;
-       folder_item_update_callback_execute(item, update_summary);
-       while (node != NULL) {
-               if (node && node->data) {
-                       FolderItem *next_item = (FolderItem*) node->data;
-                       folder_item_update_callback_execute(next_item, update_summary);
-               }
-               node = node->next;
+       if (folder_item_update_freeze_cnt > 0)
+               folder_item_update_freeze_cnt--;
+       if (folder_item_update_freeze_cnt == 0) {
+               /* Update all folders */
+               folder_func_to_all_folders(folder_item_update_func, NULL);
        }
 }