sync with sylpheed 0.6.2cvs6

[claws.git] / src / folder.c

diff --git a/src/folder.c b/src/folder.c
index b1934073b92a9e4eebd8ac9859c38100a312ad55..e7e7414a77b53a09f03e5fa932931d2e4245a33a 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -29,6 +29,7 @@
 
 #include "intl.h"
 #include "folder.h"
+#include "folderview.h"
 #include "session.h"
 #include "imap.h"
 #include "news.h"
@@ -60,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)
@@ -153,6 +155,9 @@ FolderItem *folder_item_new(const gchar *name, const gchar *path)
        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;
@@ -307,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;
@@ -399,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;
@@ -415,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;
@@ -424,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;
@@ -433,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;
@@ -442,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;
@@ -577,10 +590,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);
@@ -611,10 +620,12 @@ 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) {
                src_folder->remove_msg(src_folder,
                                       msginfo->folder,
                                       msginfo->msgnum);
+       }                                      
        
        if (folder->finished_copy)
                folder->finished_copy(folder, dest);
@@ -638,14 +649,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;
 }
@@ -702,10 +710,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);
@@ -752,14 +756,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;
 }
@@ -799,28 +800,18 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
 gint folder_item_remove_msg(FolderItem *item, gint num)
 {
        Folder *folder;
-       gint result;
+       gint ret;
 
        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_msg != NULL, -1);
-
-       if (folder->finished_remove)
-               folder->finished_remove(folder, item);
-
-       result = folder->remove_msg(folder, item, num);
-
        if (item->last_num < 0) folder->scan(folder, item);
 
-       if (result == 0){
-               if (folder->finished_remove)
-                       folder->finished_remove(folder, item);
-       }
+       ret = folder->remove_msg(folder, item, num);
+       if (ret == 0 && num == item->last_num)
+               folder->scan(folder, item);
 
-       return result;
+       return ret;
 }
 
 gint folder_item_remove_all_msg(FolderItem *item)
@@ -1050,7 +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;
+       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);
@@ -1100,6 +1092,12 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
                        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);
@@ -1111,6 +1109,9 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        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) {
@@ -1140,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);
@@ -1174,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);
@@ -1186,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);
@@ -1237,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]);
@@ -1257,6 +1271,14 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                        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);
@@ -1282,6 +1304,39 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                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;