sync with 0.7.6cvs21
[claws.git] / src / folder.c
index e1a0400594af1697e1f9ae735b6d3f2a14af2278..8b43236bd95678589f2624cc08296bcafd10664c 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * 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
@@ -29,6 +29,7 @@
 
 #include "intl.h"
 #include "folder.h"
+#include "folderview.h"
 #include "session.h"
 #include "imap.h"
 #include "news.h"
 #include "prefs.h"
 #include "account.h"
 #include "prefs_account.h"
-#include "mbox_folder.h"
+#include "prefs_folder_item.h"
 
 static GList *folder_list = NULL;
 
 static void folder_init                (Folder         *folder,
-                                FolderType      type,
                                 const gchar    *name);
 
-static void local_folder_destroy       (LocalFolder    *lfolder);
-static void remote_folder_destroy      (RemoteFolder   *rfolder);
-static void mh_folder_destroy          (MHFolder       *folder);
-static void mbox_folder_destroy                (MboxFolder     *folder);
-static void imap_folder_destroy                (IMAPFolder     *folder);
-static void news_folder_destroy                (NewsFolder     *folder);
-
 static gboolean folder_read_folder_func        (GNode          *node,
                                         gpointer        data);
 static gchar *folder_get_list_path     (void);
 static void folder_write_list_recursive        (GNode          *node,
                                         gpointer        data);
+static void folder_update_op_count_rec (GNode          *node);
+
+
+static void folder_get_persist_prefs_recursive
+                                       (GNode *node, GHashTable *pptable);
+static gboolean persist_prefs_free     (gpointer key, gpointer val, gpointer data);
 
 
 Folder *folder_new(FolderType type, const gchar *name, const gchar *path)
@@ -87,54 +86,97 @@ Folder *folder_new(FolderType type, const gchar *name, const gchar *path)
        return folder;
 }
 
-Folder *mh_folder_new(const gchar *name, const gchar *path)
+static void folder_init(Folder *folder, const gchar *name)
 {
-       Folder *folder;
+       FolderItem *item;
 
-       folder = (Folder *)g_new0(MHFolder, 1);
-       folder_init(folder, F_MH, name);
-       LOCAL_FOLDER(folder)->rootpath = g_strdup(path);
+       g_return_if_fail(folder != NULL);
 
-       return folder;
+       folder_set_name(folder, name);
+       folder->type = F_UNKNOWN;
+       folder->account = NULL;
+       folder->inbox = NULL;
+       folder->outbox = NULL;
+       folder->draft = NULL;
+       folder->queue = NULL;
+       folder->trash = NULL;
+       folder->ui_func = NULL;
+       folder->ui_func_data = NULL;
+       item = folder_item_new(name, NULL);
+       item->folder = folder;
+       folder->node = g_node_new(item);
+       folder->data = NULL;
 }
 
-Folder *mbox_folder_new(const gchar *name, const gchar *path)
+void folder_local_folder_init(Folder *folder, const gchar *name,
+                             const gchar *path)
 {
-       /* implementing */
-       Folder *folder;
-
-       folder = (Folder *)g_new0(MboxFolder, 1);
-       folder_init(folder, F_MBOX, name);
+       folder_init(folder, name);
        LOCAL_FOLDER(folder)->rootpath = g_strdup(path);
-
-       return folder;
 }
 
-Folder *maildir_folder_new(const gchar *name, const gchar *path)
+void folder_remote_folder_init(Folder *folder, const gchar *name,
+                              const gchar *path)
 {
-       /* not yet implemented */
-       return NULL;
+       folder_init(folder, name);
+       REMOTE_FOLDER(folder)->session = NULL;
 }
 
-Folder *imap_folder_new(const gchar *name, const gchar *path)
+void folder_destroy(Folder *folder)
 {
-       Folder *folder;
+       g_return_if_fail(folder != NULL);
 
-       folder = (Folder *)g_new0(IMAPFolder, 1);
-       folder_init(folder, F_IMAP, name);
+       switch (folder->type) {
+       case F_MBOX:
+               mbox_folder_destroy(MBOX_FOLDER(folder));
+       case F_MH:
+               mh_folder_destroy(MH_FOLDER(folder));
+               break;
+       case F_IMAP:
+               imap_folder_destroy(IMAP_FOLDER(folder));
+               break;
+       case F_NEWS:
+               news_folder_destroy(NEWS_FOLDER(folder));
+               break;
+       default:
+               break;
+       }
 
-       return folder;
+       folder_list = g_list_remove(folder_list, folder);
+
+       folder_tree_destroy(folder);
+       g_free(folder->name);
+       g_free(folder);
 }
 
-Folder *news_folder_new(const gchar *name, const gchar *path)
+void folder_local_folder_destroy(LocalFolder *lfolder)
 {
-       Folder *folder;
+       g_return_if_fail(lfolder != NULL);
 
-       folder = (Folder *)g_new0(NewsFolder, 1);
-       folder_init(folder, F_NEWS, name);
+       g_free(lfolder->rootpath);
+}
 
-       return folder;
+void folder_remote_folder_destroy(RemoteFolder *rfolder)
+{
+       g_return_if_fail(rfolder != NULL);
+
+       if (rfolder->session)
+               session_destroy(rfolder->session);
+}
+
+#if 0
+Folder *mbox_folder_new(const gchar *name, const gchar *path)
+{
+       /* not yet implemented */
+       return NULL;
+}
+
+Folder *maildir_folder_new(const gchar *name, const gchar *path)
+{
+       /* not yet implemented */
+       return NULL;
 }
+#endif
 
 FolderItem *folder_item_new(const gchar *name, const gchar *path)
 {
@@ -151,8 +193,15 @@ FolderItem *folder_item_new(const gchar *name, const gchar *path)
        item->unread = 0;
        item->total = 0;
        item->last_num = -1;
+       item->no_sub = FALSE;
+       item->no_select = FALSE;
+       item->collapsed = FALSE;
+       item->threaded  = TRUE;
+       item->ret_rcpt  = FALSE;
+       item->opened    = FALSE;
        item->parent = NULL;
        item->folder = NULL;
+       item->mark_queue = NULL;
        item->data = NULL;
 
        item->prefs = prefs_folder_item_new();
@@ -194,6 +243,15 @@ void folder_item_remove(FolderItem *item)
        g_node_destroy(node);
 }
 
+void folder_item_destroy(FolderItem *item)
+{
+       g_return_if_fail(item != NULL);
+
+       g_free(item->name);
+       g_free(item->path);
+       g_free(item);
+}
+
 void folder_set_ui_func(Folder *folder, FolderUIFunc func, gpointer data)
 {
        g_return_if_fail(folder != NULL);
@@ -216,37 +274,17 @@ void folder_set_name(Folder *folder, const gchar *name)
        }
 }
 
-void folder_destroy(Folder *folder)
-{
-       g_return_if_fail(folder != NULL);
-
-       folder_list = g_list_remove(folder_list, folder);
-
-       switch (folder->type) {
-       case F_MH:
-               mh_folder_destroy(MH_FOLDER(folder));
-               break;
-       case F_MBOX:
-               mbox_folder_destroy(MBOX_FOLDER(folder));
-               break;
-       case F_IMAP:
-               imap_folder_destroy(IMAP_FOLDER(folder));
-               break;
-       case F_NEWS:
-               news_folder_destroy(NEWS_FOLDER(folder));
-               break;
-       default:
-       }
-
-       folder_tree_destroy(folder);
-       g_free(folder->name);
-       g_free(folder);
-}
-
 void folder_tree_destroy(Folder *folder)
 {
        /* TODO: destroy all FolderItem before */
        g_node_destroy(folder->node);
+
+       folder->inbox = NULL;
+       folder->outbox = NULL;
+       folder->draft = NULL;
+       folder->queue = NULL;
+       folder->trash = NULL;
+       folder->node = NULL;
 }
 
 void folder_add(Folder *folder)
@@ -288,8 +326,11 @@ gint folder_read_list(void)
 {
        GNode *node;
        XMLNode *xmlnode;
+       gchar *path;
 
-       node = xml_parse_file(folder_get_list_path());
+       path = folder_get_list_path();
+       if (!is_file_exist(path)) return -1;
+       node = xml_parse_file(path);
        if (!node) return -1;
 
        xmlnode = node->data;
@@ -334,6 +375,54 @@ void folder_write_list(void)
                g_warning("failed to write folder list.\n");
 }
 
+struct TotalMsgCount
+{
+       guint new;
+       guint unread;
+       guint total;
+};
+
+static gboolean folder_count_total_msgs_func(GNode *node, gpointer data)
+{
+       FolderItem *item;
+       struct TotalMsgCount *count = (struct TotalMsgCount *)data;
+
+       g_return_val_if_fail(node->data != NULL, FALSE);
+
+       item = FOLDER_ITEM(node->data);
+       count->new += item->new;
+       count->unread += item->unread;
+       count->total += item->total;
+
+       return FALSE;
+}
+
+void folder_count_total_msgs(guint *new, guint *unread, guint *total)
+{
+       GList *list;
+       Folder *folder;
+       struct TotalMsgCount count;
+
+       count.new = count.unread = count.total = 0;
+
+       debug_print(_("Counting total number of messages...\n"));
+
+       for (list = folder_list; list != NULL; list = list->next) {
+               folder = FOLDER(list->data);
+               if (folder->node)
+                       g_node_traverse(folder->node, G_PRE_ORDER,
+                                       G_TRAVERSE_ALL, -1,
+                                       folder_count_total_msgs_func,
+                                       &count);
+       }
+
+       *new = count.new;
+       *unread = count.unread;
+       *total = count.total;
+
+       return;
+}
+
 Folder *folder_find_from_path(const gchar *path)
 {
        GList *list;
@@ -341,7 +430,7 @@ Folder *folder_find_from_path(const gchar *path)
 
        for (list = folder_list; list != NULL; list = list->next) {
                folder = list->data;
-               if (folder->type == F_MH &&
+               if ((folder->type == F_MH || folder->type == F_MBOX) &&
                    !path_cmp(LOCAL_FOLDER(folder)->rootpath, path))
                        return folder;
        }
@@ -349,6 +438,20 @@ Folder *folder_find_from_path(const gchar *path)
        return NULL;
 }
 
+Folder *folder_find_from_name(const gchar *name, FolderType type)
+{
+       GList *list;
+       Folder *folder;
+
+       for (list = folder_list; list != NULL; list = list->next) {
+               folder = list->data;
+               if (folder->type == type && strcmp2(name, folder->name) == 0)
+                       return folder;
+       }
+
+       return NULL;
+}
+
 static gboolean folder_item_find_func(GNode *node, gpointer data)
 {
        FolderItem *item = node->data;
@@ -378,15 +481,124 @@ FolderItem *folder_find_item_from_path(const gchar *path)
        return d[1];
 }
 
+static const struct {
+       gchar *str;
+       FolderType type;
+} type_str_table[] = {
+       {"#mh"     , F_MH},
+       {"#mbox"   , F_MBOX},
+       {"#maildir", F_MAILDIR},
+       {"#imap"   , F_IMAP},
+       {"#news"   , F_NEWS}
+};
+
+static gchar *folder_get_type_string(FolderType type)
+{
+       gint i;
+
+       for (i = 0; i < sizeof(type_str_table) / sizeof(type_str_table[0]);
+            i++) {
+               if (type_str_table[i].type == type)
+                       return type_str_table[i].str;
+       }
+
+       return NULL;
+}
+
+static FolderType folder_get_type_from_string(const gchar *str)
+{
+       gint i;
+
+       for (i = 0; i < sizeof(type_str_table) / sizeof(type_str_table[0]);
+            i++) {
+               if (g_strcasecmp(type_str_table[i].str, str) == 0)
+                       return type_str_table[i].type;
+       }
+
+       return F_UNKNOWN;
+}
+
+gchar *folder_get_identifier(Folder *folder)
+{
+       gchar *type_str;
+
+       g_return_val_if_fail(folder != NULL, NULL);
+
+       type_str = folder_get_type_string(folder->type);
+       return g_strconcat(type_str, "/", folder->name, NULL);
+}
+
+gchar *folder_item_get_identifier(FolderItem *item)
+{
+       gchar *id;
+       gchar *folder_id;
+
+       g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(item->path != NULL, NULL);
+
+       folder_id = folder_get_identifier(item->folder);
+       id = g_strconcat(folder_id, "/", item->path, NULL);
+       g_free(folder_id);
+
+       return id;
+}
+
+FolderItem *folder_find_item_from_identifier(const gchar *identifier)
+{
+       Folder *folder;
+       gpointer d[2];
+       gchar *str;
+       gchar *p;
+       gchar *name;
+       gchar *path;
+       FolderType type;
+
+       g_return_val_if_fail(identifier != NULL, NULL);
+
+       if (*identifier != '#')
+               return folder_find_item_from_path(identifier);
+
+       Xstrdup_a(str, identifier, return NULL);
+
+       p = strchr(str, '/');
+       if (!p)
+               return folder_find_item_from_path(identifier);
+       *p = '\0';
+       p++;
+       type = folder_get_type_from_string(str);
+       if (type == F_UNKNOWN)
+               return folder_find_item_from_path(identifier);
+
+       name = p;
+       p = strchr(p, '/');
+       if (!p)
+               return folder_find_item_from_path(identifier);
+       *p = '\0';
+       p++;
+
+       folder = folder_find_from_name(name, type);
+       if (!folder)
+               return folder_find_item_from_path(identifier);
+
+       path = p;
+
+       d[0] = (gpointer)path;
+       d[1] = NULL;
+       g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+                       folder_item_find_func, d);
+       return d[1];
+}
+
 Folder *folder_get_default_folder(void)
 {
-       return FOLDER(folder_list->data);
+       return folder_list ? FOLDER(folder_list->data) : NULL;
 }
 
 FolderItem *folder_get_default_inbox(void)
 {
        Folder *folder;
 
+       if (!folder_list) return NULL;
        folder = FOLDER(folder_list->data);
        g_return_val_if_fail(folder != NULL, NULL);
        return folder->inbox;
@@ -396,6 +608,7 @@ FolderItem *folder_get_default_outbox(void)
 {
        Folder *folder;
 
+       if (!folder_list) return NULL;
        folder = FOLDER(folder_list->data);
        g_return_val_if_fail(folder != NULL, NULL);
        return folder->outbox;
@@ -405,6 +618,7 @@ FolderItem *folder_get_default_draft(void)
 {
        Folder *folder;
 
+       if (!folder_list) return NULL;
        folder = FOLDER(folder_list->data);
        g_return_val_if_fail(folder != NULL, NULL);
        return folder->draft;
@@ -414,6 +628,7 @@ FolderItem *folder_get_default_queue(void)
 {
        Folder *folder;
 
+       if (!folder_list) return NULL;
        folder = FOLDER(folder_list->data);
        g_return_val_if_fail(folder != NULL, NULL);
        return folder->queue;
@@ -423,11 +638,56 @@ FolderItem *folder_get_default_trash(void)
 {
        Folder *folder;
 
+       if (!folder_list) return NULL;
        folder = FOLDER(folder_list->data);
        g_return_val_if_fail(folder != NULL, NULL);
        return folder->trash;
 }
 
+#define CREATE_FOLDER_IF_NOT_EXIST(member, dir, type)  \
+{                                                      \
+       if (!folder->member) {                          \
+               item = folder_item_new(dir, dir);       \
+               item->stype = type;                     \
+               folder_item_append(rootitem, item);     \
+               folder->member = item;                  \
+       }                                               \
+}
+
+void folder_set_missing_folders(void)
+{
+       Folder *folder;
+       FolderItem *rootitem;
+       FolderItem *item;
+       GList *list;
+
+       for (list = folder_list; list != NULL; list = list->next) {
+               folder = list->data;
+               if (folder->type != F_MH) continue;
+               rootitem = FOLDER_ITEM(folder->node->data);
+               g_return_if_fail(rootitem != NULL);
+
+               if (folder->inbox && folder->outbox && folder->draft &&
+                   folder->queue && folder->trash)
+                       continue;
+
+               if (folder->create_tree(folder) < 0) {
+                       g_warning("%s: can't create the folder tree.\n",
+                                 LOCAL_FOLDER(folder)->rootpath);
+                       continue;
+               }
+
+               CREATE_FOLDER_IF_NOT_EXIST(inbox,  INBOX_DIR,  F_INBOX);
+               CREATE_FOLDER_IF_NOT_EXIST(outbox, OUTBOX_DIR, F_INBOX);
+               CREATE_FOLDER_IF_NOT_EXIST(draft,  DRAFT_DIR,  F_INBOX);
+               CREATE_FOLDER_IF_NOT_EXIST(queue,  QUEUE_DIR,  F_INBOX);
+               CREATE_FOLDER_IF_NOT_EXIST(trash,  TRASH_DIR,  F_INBOX);
+       }
+
+}
+
+#undef CREATE_FOLDER_IF_NOT_EXIST
+
 gchar *folder_item_get_path(FolderItem *item)
 {
        gchar *folder_path;
@@ -486,17 +746,14 @@ gchar *folder_item_get_path(FolderItem *item)
        return path;
 }
 
-void folder_item_scan(FolderItem *item)
+gint folder_item_scan(FolderItem *item)
 {
        Folder *folder;
 
-       g_return_if_fail(item != NULL);
+       g_return_val_if_fail(item != NULL, -1);
 
        folder = item->folder;
-
-       g_return_if_fail(folder->scan != NULL);
-
-       folder->scan(folder, item);
+       return folder->scan(folder, item);
 }
 
 static void folder_item_scan_foreach_func(gpointer key, gpointer val,
@@ -558,10 +815,6 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
        g_return_val_if_fail(msginfo != NULL, -1);
 
        folder = dest->folder;
-
-       g_return_val_if_fail(folder->scan != NULL, -1);
-       g_return_val_if_fail(folder->move_msg != NULL, -1);
-
        if (dest->last_num < 0) folder->scan(folder, dest);
 
        num = folder->move_msg(folder, dest, msginfo);
@@ -592,10 +845,15 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
        src_folder = msginfo->folder->folder;
 
        num = folder->copy_msg(folder, dest, msginfo);
-       if (num != -1)
+       
+       if (num != -1) {
+               /* CLAWS */
+               g_assert(src_folder);
+               g_assert(src_folder->remove_msg);
                src_folder->remove_msg(src_folder,
                                       msginfo->folder,
                                       msginfo->msgnum);
+       }                                      
        
        if (folder->finished_copy)
                folder->finished_copy(folder, dest);
@@ -619,14 +877,11 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
        g_return_val_if_fail(msglist != NULL, -1);
 
        folder = dest->folder;
-
-       g_return_val_if_fail(folder->scan != NULL, -1);
-       g_return_val_if_fail(folder->move_msgs_with_dest != NULL, -1);
-
        if (dest->last_num < 0) folder->scan(folder, dest);
 
        num = folder->move_msgs_with_dest(folder, dest, msglist);
        if (num > 0) dest->last_num = num;
+       else dest->op_count = 0;
 
        return num;
 }
@@ -666,14 +921,10 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
        if (folder->finished_copy)
                folder->finished_copy(folder, dest);
 
-       printf("là scan\n");
-
        if (item && item->folder->scan)
                item->folder->scan(item->folder, item);
        folder->scan(folder, dest);
 
-       printf("ici scan\n");
-
        return dest->last_num;
 }
 
@@ -687,10 +938,6 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
        g_return_val_if_fail(msginfo != NULL, -1);
 
        folder = dest->folder;
-
-       g_return_val_if_fail(folder->scan != NULL, -1);
-       g_return_val_if_fail(folder->copy_msg != NULL, -1);
-
        if (dest->last_num < 0) folder->scan(folder, dest);
 
        num = folder->copy_msg(folder, dest, msginfo);
@@ -737,14 +984,11 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
        g_return_val_if_fail(msglist != NULL, -1);
 
        folder = dest->folder;
-
-       g_return_val_if_fail(folder->scan != NULL, -1);
-       g_return_val_if_fail(folder->copy_msgs_with_dest != NULL, -1);
-
        if (dest->last_num < 0) folder->scan(folder, dest);
 
        num = folder->copy_msgs_with_dest(folder, dest, msglist);
        if (num > 0) dest->last_num = num;
+       else dest->op_count = 0;
 
        return num;
 }
@@ -784,22 +1028,41 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
 gint folder_item_remove_msg(FolderItem *item, gint num)
 {
        Folder *folder;
+       gint ret;
 
        g_return_val_if_fail(item != NULL, -1);
 
        folder = item->folder;
+       if (item->last_num < 0) folder->scan(folder, item);
 
-       g_return_val_if_fail(folder->scan != NULL, -1);
-       g_return_val_if_fail(folder->remove_msg != NULL, -1);
+       ret = folder->remove_msg(folder, item, num);
+       if (ret == 0 && num == item->last_num)
+               folder->scan(folder, item);
 
-       if (item->last_num < 0) folder->scan(folder, item);
+       return ret;
+}
+
+gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
+{
+       gint ret = 0;
+
+       g_return_val_if_fail(item != NULL, -1);
+
+       while (msglist != NULL) {
+               MsgInfo *msginfo = (MsgInfo *)msglist->data;
 
-       return folder->remove_msg(folder, item, num);
+               ret = folder_item_remove_msg(item, msginfo->msgnum);
+               if (ret != 0) break;
+               msglist = msglist->next;
+       }
+
+       return ret;
 }
 
 gint folder_item_remove_all_msg(FolderItem *item)
 {
        Folder *folder;
+       gint result;
 
        g_return_val_if_fail(item != NULL, -1);
 
@@ -810,7 +1073,14 @@ gint folder_item_remove_all_msg(FolderItem *item)
 
        if (item->last_num < 0) folder->scan(folder, item);
 
-       return folder->remove_all_msg(folder, item);
+       result = folder->remove_all_msg(folder, item);
+
+       if (result == 0){
+               if (folder->finished_remove)
+                       folder->finished_remove(folder, item);
+       }
+
+       return result;
 }
 
 gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
@@ -862,145 +1132,6 @@ gchar *folder_item_get_mark_file(FolderItem *item)
        return file;
 }
 
-
-static void folder_init(Folder *folder, FolderType type, const gchar *name)
-{
-       FolderItem *item;
-
-       g_return_if_fail(folder != NULL);
-
-       folder->type = type;
-       folder_set_name(folder, name);
-       folder->account = NULL;
-       folder->inbox = NULL;
-       folder->outbox = NULL;
-       folder->draft = NULL;
-       folder->queue = NULL;
-       folder->trash = NULL;
-       folder->ui_func = NULL;
-       folder->ui_func_data = NULL;
-       item = folder_item_new(name, NULL);
-       item->folder = folder;
-       folder->node = g_node_new(item);
-       folder->data = NULL;
-
-       switch (type) {
-       case F_MH:
-               folder->get_msg_list        = mh_get_msg_list;
-               folder->fetch_msg           = mh_fetch_msg;
-               folder->add_msg             = mh_add_msg;
-               /*
-               folder->move_msg            = mh_move_msg;
-               folder->move_msgs_with_dest = mh_move_msgs_with_dest;
-               folder->copy_msg            = mh_copy_msg;
-               folder->copy_msgs_with_dest = mh_copy_msgs_with_dest;
-               */
-               folder->copy_msg            = mh_copy_msg;
-               folder->remove_msg          = mh_remove_msg;
-               folder->remove_all_msg      = mh_remove_all_msg;
-               folder->is_msg_changed      = mh_is_msg_changed;
-               folder->scan                = mh_scan_folder;
-               folder->scan_tree           = mh_scan_tree;
-               folder->create_tree         = mh_create_tree;
-               folder->create_folder       = mh_create_folder;
-               folder->rename_folder       = mh_rename_folder;
-               folder->remove_folder       = mh_remove_folder;
-               break;
-       case F_IMAP:
-               folder->get_msg_list        = imap_get_msg_list;
-               folder->fetch_msg           = imap_fetch_msg;
-               /*
-               folder->move_msg            = imap_move_msg;
-               folder->move_msgs_with_dest = imap_move_msgs_with_dest;
-               */
-               folder->remove_msg          = imap_remove_msg;
-               folder->remove_all_msg      = imap_remove_all_msg;
-               folder->scan                = imap_scan_folder;
-               folder->create_folder       = imap_create_folder;
-               folder->remove_folder       = imap_remove_folder;               
-               break;
-       case F_NEWS:
-               folder->get_msg_list        = news_get_article_list;
-               folder->fetch_msg           = news_fetch_msg;
-               folder->scan                = news_scan_group;
-               break;
-       case F_MBOX:
-               folder->get_msg_list        = mbox_get_msg_list;
-               folder->fetch_msg           = mbox_fetch_msg;
-               folder->scan                = mbox_scan_folder;
-               folder->add_msg             = mbox_add_msg;
-               folder->remove_all_msg      = mbox_remove_all_msg;
-               folder->remove_msg          = mbox_remove_msg;
-               /*
-               folder->move_msg            = mbox_move_msg;
-               folder->move_msgs_with_dest = mbox_move_msgs_with_dest;
-               folder->copy_msg            = mbox_copy_msg;
-               folder->copy_msgs_with_dest = mbox_copy_msgs_with_dest;
-               */
-               folder->copy_msg            = mbox_copy_msg;
-
-               folder->create_tree         = mbox_create_tree;
-               folder->create_folder       = mbox_create_folder;
-               folder->rename_folder       = mbox_rename_folder;
-               folder->remove_folder       = mbox_remove_folder;
-
-               folder->update_mark         = mbox_update_mark;
-               folder->change_flags        = mbox_change_flags;
-               folder->finished_copy       = mbox_finished_copy;
-
-               break;
-       default:
-       }
-
-       switch (type) {
-       case F_MH:
-       case F_MBOX:
-       case F_MAILDIR:
-               LOCAL_FOLDER(folder)->rootpath = NULL;
-               break;
-       case F_IMAP:
-       case F_NEWS:
-               REMOTE_FOLDER(folder)->session   = NULL;
-               break;
-       default:
-       }
-}
-
-static void local_folder_destroy(LocalFolder *lfolder)
-{
-       g_return_if_fail(lfolder != NULL);
-
-       g_free(lfolder->rootpath);
-}
-
-static void remote_folder_destroy(RemoteFolder *rfolder)
-{
-       g_return_if_fail(rfolder != NULL);
-
-       if (rfolder->session)
-               session_destroy(rfolder->session);
-}
-
-static void mh_folder_destroy(MHFolder *folder)
-{
-       local_folder_destroy(LOCAL_FOLDER(folder));
-}
-
-static void mbox_folder_destroy(MboxFolder *folder)
-{
-       local_folder_destroy(LOCAL_FOLDER(folder));
-}
-
-static void imap_folder_destroy(IMAPFolder *folder)
-{
-       remote_folder_destroy(REMOTE_FOLDER(folder));
-}
-
-static void news_folder_destroy(NewsFolder *folder)
-{
-       remote_folder_destroy(REMOTE_FOLDER(folder));
-}
-
 static gboolean folder_build_tree(GNode *node, gpointer data)
 {
        Folder *folder = FOLDER(data);
@@ -1011,6 +1142,10 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        const gchar *name = NULL;
        const gchar *path = NULL;
        PrefsAccount *account = NULL;
+       gboolean no_sub = FALSE, no_select = FALSE, collapsed = FALSE, 
+                threaded = TRUE, ret_rcpt = FALSE, hidereadmsgs = FALSE;
+       FolderSortKey sort_key = SORT_BY_NONE;
+       FolderSortType sort_type = SORT_ASCENDING;
        gint mtime = 0, new = 0, unread = 0, total = 0;
 
        g_return_val_if_fail(node->data != NULL, FALSE);
@@ -1048,8 +1183,7 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
                        account = account_find_from_id(atoi(attr->value));
                        if (!account) g_warning("account_id: %s not found\n",
                                                attr->value);
-               }
-               else if (!strcmp(attr->name, "mtime"))
+               } else if (!strcmp(attr->name, "mtime"))
                        mtime = atoi(attr->value);
                else if (!strcmp(attr->name, "new"))
                        new = atoi(attr->value);
@@ -1057,6 +1191,47 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
                        unread = atoi(attr->value);
                else if (!strcmp(attr->name, "total"))
                        total = atoi(attr->value);
+               else if (!strcmp(attr->name, "no_sub"))
+                       no_sub = *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "no_select"))
+                       no_select = *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "collapsed"))
+                       collapsed = *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "threaded"))
+                       threaded =  *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "hidereadmsgs"))
+                       hidereadmsgs =  *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "reqretrcpt"))
+                       ret_rcpt =  *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "sort_key")) {
+                       if (!strcmp(attr->value, "none"))
+                               sort_key = SORT_BY_NONE;
+                       else if (!strcmp(attr->value, "number"))
+                               sort_key = SORT_BY_NUMBER;
+                       else if (!strcmp(attr->value, "size"))
+                               sort_key = SORT_BY_SIZE;
+                       else if (!strcmp(attr->value, "date"))
+                               sort_key = SORT_BY_DATE;
+                       else if (!strcmp(attr->value, "from"))
+                               sort_key = SORT_BY_FROM;
+                       else if (!strcmp(attr->value, "subject"))
+                               sort_key = SORT_BY_SUBJECT;
+                       else if (!strcmp(attr->value, "score"))
+                               sort_key = SORT_BY_SCORE;
+                       else if (!strcmp(attr->value, "label"))
+                               sort_key = SORT_BY_LABEL;
+                       else if (!strcmp(attr->value, "mark"))
+                               sort_key = SORT_BY_MARK;
+                       else if (!strcmp(attr->value, "unread"))
+                               sort_key = SORT_BY_UNREAD;
+                       else if (!strcmp(attr->value, "mime"))
+                               sort_key = SORT_BY_MIME;
+               } else if (!strcmp(attr->name, "sort_type")) {
+                       if (!strcmp(attr->value, "ascending"))
+                               sort_type = SORT_ASCENDING;
+                       else
+                               sort_type = SORT_DESCENDING;
+               }
        }
 
        item = folder_item_new(name, path);
@@ -1066,6 +1241,14 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        item->new = new;
        item->unread = unread;
        item->total = total;
+       item->no_sub = no_sub;
+       item->no_select = no_select;
+       item->collapsed = collapsed;
+       item->threaded  = threaded;
+       item->hide_read_msgs  = hidereadmsgs;
+       item->ret_rcpt  = ret_rcpt;
+       item->sort_key  = sort_key;
+       item->sort_type = sort_type;
        item->parent = FOLDER_ITEM(node->parent->data);
        item->folder = folder;
        switch (stype) {
@@ -1074,7 +1257,7 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        case F_DRAFT:  folder->draft  = item; break;
        case F_QUEUE:  folder->queue  = item; break;
        case F_TRASH:  folder->trash  = item; break;
-       default:
+       default:       break;
        }
 
        prefs_folder_item_read_config(item);
@@ -1094,6 +1277,7 @@ static gboolean folder_read_folder_func(GNode *node, gpointer data)
        const gchar *name = NULL;
        const gchar *path = NULL;
        PrefsAccount *account = NULL;
+       gboolean collapsed = FALSE, threaded = TRUE, ret_rcpt = FALSE;
 
        if (g_node_depth(node) != 2) return FALSE;
        g_return_val_if_fail(node->data != NULL, FALSE);
@@ -1128,7 +1312,12 @@ static gboolean folder_read_folder_func(GNode *node, gpointer data)
                        account = account_find_from_id(atoi(attr->value));
                        if (!account) g_warning("account_id: %s not found\n",
                                                attr->value);
-               }
+               } else if (!strcmp(attr->name, "collapsed"))
+                       collapsed = *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "threaded"))
+                       threaded = *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "reqretrcpt"))
+                       ret_rcpt = *attr->value == '1' ? TRUE : FALSE;
        }
 
        folder = folder_new(type, name, path);
@@ -1140,6 +1329,9 @@ static gboolean folder_read_folder_func(GNode *node, gpointer data)
        g_node_destroy(folder->node);
        folder->node = node;
        folder_add(folder);
+       FOLDER_ITEM(node->data)->collapsed = collapsed;
+       FOLDER_ITEM(node->data)->threaded  = threaded;
+       FOLDER_ITEM(node->data)->ret_rcpt  = ret_rcpt;
 
        g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
                        folder_build_tree, folder);
@@ -1167,6 +1359,9 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                                           "news", "unknown"};
        static gchar *folder_item_stype_str[] = {"normal", "inbox", "outbox",
                                                 "draft", "queue", "trash"};
+       static gchar *sort_key_str[] = {"none", "number", "size", "date",
+                                       "from", "subject", "score", "label",
+                                       "mark", "unread", "mime"};
 
        g_return_if_fail(item != NULL);
 
@@ -1191,6 +1386,10 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                if (folder->account)
                        fprintf(fp, " account_id=\"%d\"",
                                folder->account->account_id);
+               if (item->collapsed && node->children)
+                       fputs(" collapsed=\"1\"", fp);
+               if (item->ret_rcpt) 
+                       fputs(" reqretrcpt=\"1\"", fp);
        } else {
                fprintf(fp, "<folderitem type=\"%s\"",
                        folder_item_stype_str[item->stype]);
@@ -1205,10 +1404,36 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                        fputs("\"", fp);
                }
                if (item->account)
-                       fprintf(fp, " account_id = \"%d\"",
+                       fprintf(fp, " account_id=\"%d\"",
                                item->account->account_id);
+               if (item->no_sub)
+                       fputs(" no_sub=\"1\"", fp);
+               if (item->no_select)
+                       fputs(" no_select=\"1\"", fp);
+               if (item->collapsed && node->children)
+                       fputs(" collapsed=\"1\"", fp);
+               if (item->threaded)
+                       fputs(" threaded=\"1\"", fp);
+               else
+                       fputs(" threaded=\"0\"", fp);
+               if (item->hide_read_msgs)
+                       fputs(" hidereadmsgs=\"1\"", fp);
+               else
+                       fputs(" hidereadmsgs=\"0\"", fp);
+               if (item->ret_rcpt)
+                       fputs(" reqretrcpt=\"1\"", fp);
+
+               if (item->sort_key != SORT_BY_NONE) {
+                       fprintf(fp, " sort_key=\"%s\"",
+                               sort_key_str[item->sort_key]);
+                       if (item->sort_type == SORT_ASCENDING)
+                               fprintf(fp, " sort_type=\"ascending\"");
+                       else
+                               fprintf(fp, " sort_type=\"descending\"");
+               }
+
                fprintf(fp,
-                       " mtime=\"%ld\" new=\"%d\" unread=\"%d\" total=\"%d\"",
+                       " mtime=\"%lu\" new=\"%d\" unread=\"%d\" total=\"%d\"",
                        item->mtime, item->new, item->unread, item->total);
        }
 
@@ -1231,3 +1456,201 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
        } else
                fputs(" />\n", fp);
 }
+
+static void folder_update_op_count_rec(GNode *node) {
+       FolderItem *fitem = FOLDER_ITEM(node->data);
+
+       if (g_node_depth(node) > 0) {
+               if (fitem->op_count > 0) {
+                       fitem->op_count = 0;
+                       folderview_update_item(fitem, 0);
+               }
+               if (node->children) {
+                       GNode *child;
+
+                       child = node->children;
+                       while (child) {
+                               GNode *cur;
+
+                               cur = child;
+                               child = cur->next;
+                               folder_update_op_count_rec(cur);
+                       }
+               }
+       }
+}
+
+void folder_update_op_count() {
+       GList *cur;
+       Folder *folder;
+
+       for (cur = folder_list; cur != NULL; cur = cur->next) {
+               folder = cur->data;
+               folder_update_op_count_rec(folder->node);
+       }
+}
+
+typedef struct _type_str {
+       gchar * str;
+       gint type;
+} type_str;
+
+
+/*
+static gchar * folder_item_get_tree_identifier(FolderItem * item)
+{
+       if (item->parent != NULL) {
+               gchar * path;
+               gchar * id;
+
+               path = folder_item_get_tree_identifier(item->parent);
+               if (path == NULL)
+                       return NULL;
+
+               id = g_strconcat(path, "/", item->name, NULL);
+               g_free(path);
+
+               return id;
+       }
+       else {
+               return g_strconcat("/", item->name, NULL);
+       }
+}
+*/
+
+/* CLAWS: temporary local folder for filtering */
+static Folder *processing_folder;
+static FolderItem *processing_folder_item;
+
+static void folder_create_processing_folder(void)
+{
+#define PROCESSING_FOLDER ".processing"        
+       Folder     *tmpparent;
+       FolderItem *tmpfolder;
+       gchar      *tmpname;
+
+       tmpparent = folder_get_default_folder();
+       g_assert(tmpparent);
+       debug_print("tmpparentroot %s\n", LOCAL_FOLDER(tmpparent)->rootpath);
+       if (LOCAL_FOLDER(tmpparent)->rootpath[0] == '/')
+               tmpname = g_strconcat(LOCAL_FOLDER(tmpparent)->rootpath,
+                                     G_DIR_SEPARATOR_S, PROCESSING_FOLDER,
+                                     NULL);
+       else
+               tmpname = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+                                     LOCAL_FOLDER(tmpparent)->rootpath,
+                                     G_DIR_SEPARATOR_S, PROCESSING_FOLDER,
+                                     NULL);
+
+       processing_folder = folder_new(F_MH, "PROCESSING", LOCAL_FOLDER(tmpparent)->rootpath);
+       g_assert(processing_folder);
+
+       if (!is_dir_exist(tmpname)) {
+               debug_print("*TMP* creating %s\n", tmpname);
+               processing_folder_item = processing_folder->create_folder(processing_folder,
+                                                                         processing_folder->node->data,
+                                                                         PROCESSING_FOLDER);
+               g_assert(processing_folder_item);                                                                         
+       }
+       else {
+               debug_print("*TMP* already created\n");
+               processing_folder_item = folder_item_new(".processing", ".processing");
+               g_assert(processing_folder_item);
+               folder_item_append(processing_folder->node->data, processing_folder_item);
+       }
+       g_free(tmpname);
+}
+
+FolderItem *folder_get_default_processing(void)
+{
+       if (!processing_folder_item) {
+               folder_create_processing_folder();
+       }
+       return processing_folder_item;
+}
+
+/* folder_persist_prefs_new() - return hash table with persistent
+ * settings (and folder name as key). 
+ * (note that in claws other options are in the PREFS_FOLDER_ITEM_RC
+ * file, so those don't need to be included in PersistPref yet) 
+ */
+GHashTable *folder_persist_prefs_new(Folder *folder)
+{
+       GHashTable *pptable;
+
+       g_return_val_if_fail(folder, NULL);
+       pptable = g_hash_table_new(g_str_hash, g_str_equal);
+       folder_get_persist_prefs_recursive(folder->node, pptable);
+       return pptable;
+}
+
+void folder_persist_prefs_free(GHashTable *pptable)
+{
+       g_return_if_fail(pptable);
+       g_hash_table_foreach_remove(pptable, persist_prefs_free, NULL);
+       g_hash_table_destroy(pptable);
+}
+
+const PersistPrefs *folder_get_persist_prefs(GHashTable *pptable, const char *name)
+{
+       if (pptable == NULL || name == NULL) return NULL;
+       return g_hash_table_lookup(pptable, name);
+}
+
+void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *pptable)
+{
+       const PersistPrefs *pp;
+
+       pp = folder_get_persist_prefs(pptable, item->path); 
+       if (!pp) return;
+
+       /* CLAWS: since not all folder properties have been migrated to 
+        * folderlist.xml, we need to call the old stuff first before
+        * setting things that apply both to Main and Claws. */
+       prefs_folder_item_read_config(item); 
+        
+       item->collapsed = pp->collapsed;
+       item->threaded  = pp->threaded;
+       item->ret_rcpt  = pp->ret_rcpt;
+       item->hide_read_msgs = pp->hide_read_msgs;
+}
+
+static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
+{
+       FolderItem *item = FOLDER_ITEM(node->data);
+       PersistPrefs *pp;
+       GNode *child, *cur;
+
+       g_return_if_fail(node != NULL);
+       g_return_if_fail(item != NULL);
+
+       /* FIXME: item->path == NULL for top level folder, so this means that 
+        * properties of MH folder root will not be stored. Not quite important, 
+        * because the top level folder properties are not special anyway. */
+       if (item->path) {
+               pp = g_new0(PersistPrefs, 1);
+               g_return_if_fail(pp != NULL);
+               pp->collapsed = item->collapsed;
+               pp->threaded  = item->threaded;
+               pp->ret_rcpt  = item->ret_rcpt; 
+               pp->hide_read_msgs = item->hide_read_msgs;
+               g_hash_table_insert(pptable, item->path, pp);
+       }               
+
+       if (node->children) {
+               child = node->children;
+               while (child) {
+                       cur = child;
+                       child = cur->next;
+                       folder_get_persist_prefs_recursive(cur, pptable);
+               }
+       }       
+}
+
+static gboolean persist_prefs_free(gpointer key, gpointer val, gpointer data)
+{
+       if (val) 
+               g_free(val);
+       return TRUE;    
+}
+