sync with sylpheed 0.6.2cvs6
[claws.git] / src / folder.c
index 6d06c207fcf4d694541a427053aba509db23c935..e7e7414a77b53a09f03e5fa932931d2e4245a33a 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-2001 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
 
 #include "intl.h"
 #include "folder.h"
+#include "folderview.h"
 #include "session.h"
 #include "imap.h"
 #include "news.h"
 #include "mh.h"
+#include "mbox_folder.h"
 #include "utils.h"
 #include "xml.h"
 #include "codeconv.h"
 #include "prefs.h"
 #include "account.h"
 #include "prefs_account.h"
+#include "mbox_folder.h"
 
 static GList *folder_list = NULL;
 
@@ -49,6 +52,7 @@ static void folder_init               (Folder         *folder,
 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);
 
@@ -57,6 +61,7 @@ static gboolean folder_read_folder_func       (GNode          *node,
 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);
 
 
 Folder *folder_new(FolderType type, const gchar *name, const gchar *path)
@@ -65,6 +70,9 @@ Folder *folder_new(FolderType type, const gchar *name, const gchar *path)
 
        name = name ? name : path;
        switch (type) {
+       case F_MBOX:
+               folder = mbox_folder_new(name, path);
+               break;
        case F_MH:
                folder = mh_folder_new(name, path);
                break;
@@ -94,8 +102,14 @@ Folder *mh_folder_new(const gchar *name, const gchar *path)
 
 Folder *mbox_folder_new(const gchar *name, const gchar *path)
 {
-       /* not yet implemented */
-       return NULL;
+       /* implementing */
+       Folder *folder;
+
+       folder = (Folder *)g_new0(MboxFolder, 1);
+       folder_init(folder, F_MBOX, name);
+       LOCAL_FOLDER(folder)->rootpath = g_strdup(path);
+
+       return folder;
 }
 
 Folder *maildir_folder_new(const gchar *name, const gchar *path)
@@ -139,6 +153,11 @@ 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->parent = NULL;
        item->folder = NULL;
        item->data = NULL;
@@ -182,6 +201,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);
@@ -214,6 +242,9 @@ void folder_destroy(Folder *folder)
        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;
@@ -221,6 +252,7 @@ void folder_destroy(Folder *folder)
                news_folder_destroy(NEWS_FOLDER(folder));
                break;
        default:
+               break;
        }
 
        folder_tree_destroy(folder);
@@ -232,6 +264,13 @@ 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)
@@ -246,11 +285,16 @@ void folder_add(Folder *folder)
                cur_folder = FOLDER(cur->data);
                if (folder->type == F_MH) {
                        if (cur_folder->type != F_MH) break;
+               } else if (folder->type == F_MBOX) {
+                       if (cur_folder->type != F_MH &&
+                           cur_folder->type != F_MBOX) break;
                } else if (folder->type == F_IMAP) {
                        if (cur_folder->type != F_MH &&
+                           cur_folder->type != F_MBOX &&
                            cur_folder->type != F_IMAP) break;
                } else if (folder->type == F_NEWS) {
                        if (cur_folder->type != F_MH &&
+                           cur_folder->type != F_MBOX &&
                            cur_folder->type != F_IMAP &&
                            cur_folder->type != F_NEWS) break;
                }
@@ -268,8 +312,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;
@@ -321,7 +368,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;
        }
@@ -360,13 +407,14 @@ FolderItem *folder_find_item_from_path(const gchar *path)
 
 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;
@@ -376,6 +424,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;
@@ -385,6 +434,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;
@@ -394,6 +444,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;
@@ -403,6 +454,7 @@ 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;
@@ -417,6 +469,16 @@ gchar *folder_item_get_path(FolderItem *item)
 
        if (FOLDER_TYPE(item->folder) == F_MH)
                folder_path = g_strdup(LOCAL_FOLDER(item->folder)->rootpath);
+       else if (FOLDER_TYPE(item->folder) == F_MBOX) {
+               path = mbox_get_virtual_path(item);
+               if (path == NULL)
+                       return NULL;
+               folder_path = g_strconcat(get_mbox_cache_dir(),
+                                         G_DIR_SEPARATOR_S, path, NULL);
+               g_free(path);
+
+               return folder_path;
+       }
        else if (FOLDER_TYPE(item->folder) == F_IMAP) {
                g_return_val_if_fail(item->folder->account != NULL, NULL);
                folder_path = g_strconcat(get_imap_cache_dir(),
@@ -463,6 +525,9 @@ void folder_item_scan(FolderItem *item)
        g_return_if_fail(item != NULL);
 
        folder = item->folder;
+
+       g_return_if_fail(folder->scan != NULL);
+
        folder->scan(folder, item);
 }
 
@@ -484,6 +549,10 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
        g_return_val_if_fail(item != NULL, NULL);
 
        folder = item->folder;
+
+       g_return_val_if_fail(folder->scan != NULL, NULL);
+       g_return_val_if_fail(folder->fetch_msg != NULL, NULL);
+
        if (item->last_num < 0) folder->scan(folder, item);
 
        return folder->fetch_msg(folder, item, num);
@@ -497,9 +566,12 @@ gint folder_item_add_msg(FolderItem *dest, const gchar *file,
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(file != NULL, -1);
-       g_return_val_if_fail(dest->folder->add_msg != NULL, -1);
 
        folder = dest->folder;
+
+       g_return_val_if_fail(folder->scan != NULL, -1);
+       g_return_val_if_fail(folder->add_msg != NULL, -1);
+
        if (dest->last_num < 0) folder->scan(folder, dest);
 
        num = folder->add_msg(folder, dest, file, remove_source);
@@ -508,6 +580,7 @@ gint folder_item_add_msg(FolderItem *dest, const gchar *file,
        return num;
 }
 
+/*
 gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
 {
        Folder *folder;
@@ -524,7 +597,49 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
 
        return num;
 }
+*/
+
+gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
+{
+       Folder *folder;
+       gint num;
+       gchar * filename;
+       Folder * src_folder;
+
+       g_return_val_if_fail(dest != NULL, -1);
+       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->remove_msg != NULL, -1);
+       g_return_val_if_fail(folder->copy_msg != NULL, -1);
+
+       if (dest->last_num < 0) folder->scan(folder, dest);
+
+       src_folder = msginfo->folder->folder;
+
+       num = folder->copy_msg(folder, dest, msginfo);
+
+       if (num != -1) {
+               src_folder->remove_msg(src_folder,
+                                      msginfo->folder,
+                                      msginfo->msgnum);
+       }                                      
+       
+       if (folder->finished_copy)
+               folder->finished_copy(folder, dest);
+
+       src_folder = msginfo->folder->folder;
+
+       if (msginfo->folder && src_folder->scan)
+               src_folder->scan(src_folder, msginfo->folder);
+       folder->scan(folder, dest);
+
+       return num;
+}
+
+/*
 gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
 {
        Folder *folder;
@@ -538,10 +653,54 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
 
        num = folder->move_msgs_with_dest(folder, dest, msglist);
        if (num > 0) dest->last_num = num;
+       else dest->op_count = 0;
 
        return num;
 }
+*/
+
+gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
+{
+       Folder *folder;
+       FolderItem * item;
+       GSList * l;
+       gchar * filename;
+
+       g_return_val_if_fail(dest != NULL, -1);
+       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_msg != NULL, -1);
+       g_return_val_if_fail(folder->remove_msg != NULL, -1);
+
+       if (dest->last_num < 0) folder->scan(folder, dest);
+
+       item = NULL;
+       for(l = msglist ; l != NULL ; l = g_slist_next(l)) {
+               MsgInfo * msginfo = (MsgInfo *) l->data;
+
+               if (!item && msginfo->folder != NULL)
+                       item = msginfo->folder;
+
+               if (folder->copy_msg(folder, dest, msginfo) != -1)
+                       item->folder->remove_msg(item->folder,
+                                                msginfo->folder,
+                                                msginfo->msgnum);
+       }
+
+       if (folder->finished_copy)
+               folder->finished_copy(folder, dest);
+
+       if (item && item->folder->scan)
+               item->folder->scan(item->folder, item);
+       folder->scan(folder, dest);
+
+       return dest->last_num;
+}
 
+/*
 gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
 {
        Folder *folder;
@@ -558,7 +717,36 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
 
        return num;
 }
+*/
+
+gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
+{
+       Folder *folder;
+       gint num;
+       gchar * filename;
+       Folder * src_folder;
+
+       g_return_val_if_fail(dest != NULL, -1);
+       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);
+
+       if (folder->finished_copy)
+               folder->finished_copy(folder, dest);
+
+       folder->scan(folder, dest);
+
+       return num;
+}
 
+/*
 gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
 {
        Folder *folder;
@@ -572,32 +760,82 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
 
        num = folder->copy_msgs_with_dest(folder, dest, msglist);
        if (num > 0) dest->last_num = num;
+       else dest->op_count = 0;
 
        return num;
 }
+*/
+
+gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
+{
+       Folder *folder;
+       gint num;
+       GSList * l;
+       gchar * filename;
+
+       g_return_val_if_fail(dest != NULL, -1);
+       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_msg != NULL, -1);
+
+       if (dest->last_num < 0) folder->scan(folder, dest);
+
+       for(l = msglist ; l != NULL ; l = g_slist_next(l)) {
+               MsgInfo * msginfo = (MsgInfo *) l->data;
+
+               folder->copy_msg(folder, dest, msginfo);
+       }
+
+       if (folder->finished_copy)
+               folder->finished_copy(folder, dest);
+
+       folder->scan(folder, dest);
+
+       return dest->last_num;
+}
 
 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);
 
-       return folder->remove_msg(folder, item, num);
+       ret = folder->remove_msg(folder, item, num);
+       if (ret == 0 && num == item->last_num)
+               folder->scan(folder, item);
+
+       return ret;
 }
 
 gint folder_item_remove_all_msg(FolderItem *item)
 {
        Folder *folder;
+       gint result;
 
        g_return_val_if_fail(item != NULL, -1);
 
        folder = item->folder;
+
+       g_return_val_if_fail(folder->scan != NULL, -1);
+       g_return_val_if_fail(folder->remove_all_msg != NULL, -1);
+
        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)
@@ -607,6 +845,9 @@ gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
        g_return_val_if_fail(item != NULL, FALSE);
 
        folder = item->folder;
+
+       g_return_val_if_fail(folder->is_msg_changed != NULL, -1);
+
        return folder->is_msg_changed(folder, item, msginfo);
 }
 
@@ -673,10 +914,13 @@ static void folder_init(Folder *folder, FolderType type, const gchar *name)
                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;
@@ -690,20 +934,51 @@ static void folder_init(Folder *folder, FolderType type, const gchar *name)
        case F_IMAP:
                folder->get_msg_list        = imap_get_msg_list;
                folder->fetch_msg           = imap_fetch_msg;
+               folder->add_msg             = imap_add_msg;
                folder->move_msg            = imap_move_msg;
                folder->move_msgs_with_dest = imap_move_msgs_with_dest;
+               folder->copy_msg            = imap_copy_msg;
+               folder->copy_msgs_with_dest = imap_copy_msgs_with_dest;
                folder->remove_msg          = imap_remove_msg;
                folder->remove_all_msg      = imap_remove_all_msg;
                folder->scan                = imap_scan_folder;
+               folder->scan_tree           = imap_scan_tree;
+               folder->create_tree         = imap_create_tree;
                folder->create_folder       = imap_create_folder;
-               folder->remove_folder       = imap_remove_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;
+               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:
+               break;
        }
 
        switch (type) {
@@ -714,9 +989,10 @@ static void folder_init(Folder *folder, FolderType type, const gchar *name)
                break;
        case F_IMAP:
        case F_NEWS:
-               REMOTE_FOLDER(folder)->session   = NULL;
+               REMOTE_FOLDER(folder)->session = NULL;
                break;
        default:
+               break;
        }
 }
 
@@ -740,6 +1016,11 @@ 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));
@@ -760,6 +1041,8 @@ 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;
        gint mtime = 0, new = 0, unread = 0, total = 0;
 
        g_return_val_if_fail(node->data != NULL, FALSE);
@@ -797,8 +1080,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);
@@ -806,6 +1088,16 @@ 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, "reqretrcpt"))
+                       ret_rcpt =  *attr->value == '1' ? TRUE : FALSE;
        }
 
        item = folder_item_new(name, path);
@@ -815,6 +1107,11 @@ 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->ret_rcpt  = ret_rcpt;
        item->parent = FOLDER_ITEM(node->parent->data);
        item->folder = folder;
        switch (stype) {
@@ -824,6 +1121,7 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        case F_QUEUE:  folder->queue  = item; break;
        case F_TRASH:  folder->trash  = item; break;
        default:
+               break;
        }
 
        prefs_folder_item_read_config(item);
@@ -843,6 +1141,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);
@@ -877,7 +1176,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);
@@ -889,6 +1193,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);
@@ -931,7 +1238,7 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                        xml_file_put_escape_str(fp, folder->name);
                        fputs("\"", fp);
                }
-               if (folder->type == F_MH) {
+               if ((folder->type == F_MH) || (folder->type == F_MBOX)) {
                        fputs(" path=\"", fp);
                        xml_file_put_escape_str
                                (fp, LOCAL_FOLDER(folder)->rootpath);
@@ -940,6 +1247,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]);
@@ -954,8 +1265,20 @@ 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->ret_rcpt)
+                       fputs(" reqretrcpt=\"1\"", fp);
                fprintf(fp,
                        " mtime=\"%ld\" new=\"%d\" unread=\"%d\" total=\"%d\"",
                        item->mtime, item->new, item->unread, item->total);
@@ -980,3 +1303,186 @@ 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 type_str type_str_table[] = 
+{
+       {"#mh", F_MH},
+       {"#mbox", F_MBOX},
+       {"#maildir", F_MAILDIR},
+       {"#imap", F_IMAP},
+       {"#news", F_NEWS}
+};
+
+
+static gchar * folder_get_type_string(gint type)
+{
+       gint i;
+
+       for(i = 0 ; i < sizeof(type_str_table) / sizeof(type_str) ; i++) {
+               if (type_str_table[i].type == type)
+                       return type_str_table[i].str;
+       }
+       return NULL;
+}
+
+static gint folder_get_type_from_string(gchar * str)
+{
+       gint i;
+
+       for(i = 0 ; i < sizeof(type_str_table) / sizeof(type_str) ; i++) {
+               if (g_strcasecmp(type_str_table[i].str, str))
+                       return type_str_table[i].type;
+       }
+       return F_UNKNOWN;
+}
+
+gchar * folder_get_identifier(Folder * folder)
+{
+       gchar * type_str;
+       type_str = folder_get_type_string(folder->type);
+
+       return g_strconcat(type_str, "/", folder->name, NULL);
+}
+
+/*
+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);
+       }
+}
+*/
+
+gchar * folder_item_get_identifier(FolderItem * item)
+{
+       gchar * path;
+       gchar * id;
+       gchar * folder_str;
+
+       folder_str = folder_get_identifier(item->folder);
+
+       if (item->path == NULL) {
+               g_free(folder_str);
+               return NULL;
+       }
+
+       id = g_strconcat(folder_str, "/", item->path, NULL);
+
+       return id;
+}
+
+Folder * folder_find_from_name(const gchar * name)
+{
+       GList *list;
+       Folder *folder;
+
+       for (list = g_list_first(folder_list); list != NULL;
+            list = list->next) {
+               folder = list->data;
+               if (strcmp(name, folder->name) == 0)
+                       return folder;
+       }
+       return NULL;
+}
+
+FolderItem * folder_find_item_from_identifier(const gchar *identifier)
+{
+       Folder *folder;
+       gpointer d[2];
+       gchar * str;
+       gchar * p;
+       gint type;
+       gchar * name;
+       gchar * path;
+
+       Xalloca(str, strlen(identifier) + 1, return NULL);
+       strcpy(str, identifier);
+
+       /* extract box type */
+
+       p = strchr(str, '/');
+
+       if (p == NULL)
+               return NULL;
+
+       *p = '\0';
+
+       type = folder_get_type_from_string(str);
+
+       str = p + 1;
+
+       /* extract box name */
+
+       p = strchr(str, '/');
+
+       if (p == NULL)
+               return NULL;
+
+       *p = '\0';
+
+       name = str;
+
+       folder = folder_find_from_name(name);
+       if (folder == NULL)
+               return;
+
+       path = p + 1;
+
+       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];
+}