2005-07-06 [colin] 1.9.12cvs24

[claws.git] / src / folder.c

diff --git a/src/folder.c b/src/folder.c
index a934d129cc2d6b807744145059c906fe700c32b4..97ef715c403db387df8b05273e5702b981def8ea 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -156,6 +156,9 @@ Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
 
        /* Create root folder item */
        item = folder_item_new(folder, name, NULL);
+       if (item == NULL) {
+               return NULL;
+       }
        item->folder = folder;
        folder->node = item->node = g_node_new(item);
        folder->data = NULL;
@@ -257,7 +260,9 @@ XMLTag *folder_get_xml(Folder *folder)
 FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path)
 {
        FolderItem *item = NULL;
-
+       
+       g_return_val_if_fail(folder != NULL, NULL);
+       
        if (folder->klass->item_new) {
                item = folder->klass->item_new(folder);
        } else {
@@ -273,6 +278,7 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
        item->new_msgs = 0;
        item->unread_msgs = 0;
        item->unreadmarked_msgs = 0;
+       item->marked_msgs = 0;
        item->total_msgs = 0;
        item->last_num = -1;
        item->cache = NULL;
@@ -333,7 +339,6 @@ void folder_item_remove(FolderItem *item)
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
        g_return_if_fail(item->node != NULL);
-
        node = item->node;
 
        if (item->folder->node == node)
@@ -443,6 +448,8 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
                        item->unread_msgs = atoi(attr->value);
                else if (!strcmp(attr->name, "unreadmarked"))
                        item->unreadmarked_msgs = atoi(attr->value);
+               else if (!strcmp(attr->name, "marked"))
+                       item->marked_msgs = atoi(attr->value);
                else if (!strcmp(attr->name, "total"))
                        item->total_msgs = atoi(attr->value);
                else if (!strcmp(attr->name, "no_sub"))
@@ -544,6 +551,7 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
        xml_tag_add_attr(tag, xml_attr_new_int("new", item->new_msgs));
        xml_tag_add_attr(tag, xml_attr_new_int("unread", item->unread_msgs));
        xml_tag_add_attr(tag, xml_attr_new_int("unreadmarked", item->unreadmarked_msgs));
+       xml_tag_add_attr(tag, xml_attr_new_int("marked", item->marked_msgs));
        xml_tag_add_attr(tag, xml_attr_new_int("total", item->total_msgs));
 
        if (item->account)
@@ -822,6 +830,7 @@ struct TotalMsgCount
        guint new_msgs;
        guint unread_msgs;
        guint unreadmarked_msgs;
+       guint marked_msgs;
        guint total_msgs;
 };
 
@@ -872,6 +881,7 @@ static void folder_count_total_msgs_func(FolderItem *item, gpointer data)
        count->new_msgs += item->new_msgs;
        count->unread_msgs += item->unread_msgs;
        count->unreadmarked_msgs += item->unreadmarked_msgs;
+       count->marked_msgs += item->marked_msgs;
        count->total_msgs += item->total_msgs;
 }
 
@@ -982,7 +992,9 @@ gchar *folder_get_status(GPtrArray *folders, gboolean full)
        return ret;
 }
 
-void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs, guint *unreadmarked_msgs, guint *total_msgs)
+void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs, 
+                            guint *unreadmarked_msgs, guint *marked_msgs,
+                            guint *total_msgs)
 {
        struct TotalMsgCount count;
 
@@ -995,6 +1007,7 @@ void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs, guint *unreadm
        *new_msgs = count.new_msgs;
        *unread_msgs = count.unread_msgs;
        *unreadmarked_msgs = count.unreadmarked_msgs;
+       *marked_msgs = count.marked_msgs;
        *total_msgs = count.total_msgs;
 }
 
@@ -1438,6 +1451,8 @@ static gint folder_sort_folder_list(gconstpointer a, gconstpointer b)
 gint folder_item_open(FolderItem *item)
 {
        gchar *buf;
+       g_return_val_if_fail(item->no_select == FALSE, -1);
+
        if((item->folder->klass->scan_required != NULL) &&
           (item->folder->klass->scan_required(item->folder, item))) {
                folder_item_scan_full(item, TRUE);
@@ -1465,6 +1480,7 @@ gint folder_item_close(FolderItem *item)
        Folder *folder;
        
        g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->no_select == FALSE, -1);
 
        if (item->new_msgs) {
                folder_item_update_freeze();
@@ -1498,7 +1514,8 @@ static MsgInfoList *get_msginfos(FolderItem *item, MsgNumberList *numlist)
 {
        MsgInfoList *msglist = NULL;
        Folder *folder = item->folder;
-
+       g_return_val_if_fail(item->no_select == FALSE, NULL);
+       
        if (folder->klass->get_msginfos != NULL)
                msglist = folder->klass->get_msginfos(folder, item, numlist);
        else {
@@ -1544,6 +1561,7 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
                return 0;
        if(item->folder->klass->get_flags == NULL)
                return 0;
+       g_return_val_if_fail(item->no_select == FALSE, 0);
 
        relation = g_relation_new(2);
        g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
@@ -1585,7 +1603,8 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        GSList *folder_list_cur, *cache_list_cur, *new_list = NULL;
        GSList *exists_list = NULL, *elem;
        GSList *newmsg_list = NULL;
-       guint newcnt = 0, unreadcnt = 0, totalcnt = 0, unreadmarkedcnt = 0;
+       guint newcnt = 0, unreadcnt = 0, totalcnt = 0;
+       guint markedcnt = 0, unreadmarkedcnt = 0;
        guint cache_max_num, folder_max_num, cache_cur_num, folder_cur_num;
        gboolean update_flags = 0, old_uids_valid = FALSE;
     
@@ -1802,6 +1821,9 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                        unreadcnt++;
                if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                        unreadmarkedcnt++;
+               if (MSG_IS_MARKED(msginfo->flags))
+                       markedcnt++;
+
                totalcnt++;
 
                procmsg_msginfo_free(msginfo);
@@ -1812,6 +1834,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        item->unread_msgs = unreadcnt;
        item->total_msgs = totalcnt;
        item->unreadmarked_msgs = unreadmarkedcnt;
+       item->marked_msgs = markedcnt;
 
        update_flags |= F_ITEM_UPDATE_MSGCNT;
 
@@ -1871,7 +1894,8 @@ gint folder_item_syncronize_flags(FolderItem *item)
        g_return_val_if_fail(item != NULL, -1);
        g_return_val_if_fail(item->folder != NULL, -1);
        g_return_val_if_fail(item->folder->klass != NULL, -1);
-       
+       g_return_val_if_fail(item->no_select == FALSE, -1);     
+
        if (item->cache == NULL)
                folder_item_read_cache(item);
        
@@ -1965,7 +1989,8 @@ void folder_item_read_cache(FolderItem *item)
                item->cache = msgcache_read_cache(item, cache_file);
                if (!item->cache) {
                        MsgInfoList *list, *cur;
-                       guint newcnt = 0, unreadcnt = 0, unreadmarkedcnt = 0;
+                       guint newcnt = 0, unreadcnt = 0;
+                       guint markedcnt = 0, unreadmarkedcnt = 0;
                        MsgInfo *msginfo;
 
                        item->cache = msgcache_new();
@@ -1983,10 +2008,13 @@ void folder_item_read_cache(FolderItem *item)
                                        unreadcnt++;
                                if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                                        unreadmarkedcnt++;
+                               if (MSG_IS_MARKED(msginfo->flags))
+                                       markedcnt++;
                        }
                        item->new_msgs = newcnt;
                        item->unread_msgs = unreadcnt;
                        item->unreadmarked_msgs = unreadmarkedcnt;
+                       item->marked_msgs = markedcnt;
                        procmsg_msg_list_free(list);
                } else
                        msgcache_read_mark(item->cache, mark_file);
@@ -2037,7 +2065,7 @@ MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
        MsgInfo *msginfo = NULL;
        
        g_return_val_if_fail(item != NULL, NULL);
-       
+       g_return_val_if_fail(item->no_select == FALSE, NULL);   
        folder = item->folder;
        if (!item->cache)
                folder_item_read_cache(item);
@@ -2061,6 +2089,7 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
        
        g_return_val_if_fail(item != NULL, NULL);
        g_return_val_if_fail(msgid != NULL, NULL);
+       g_return_val_if_fail(item->no_select == FALSE, FALSE);
        
        folder = item->folder;
        if (!item->cache)
@@ -2075,6 +2104,7 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
 GSList *folder_item_get_msg_list(FolderItem *item)
 {
        g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(item->no_select == FALSE, FALSE);
        
        if (item->cache == 0)
                folder_item_read_cache(item);
@@ -2126,6 +2156,7 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
        folder = item->folder;
 
        g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
+       g_return_val_if_fail(item->no_select == FALSE, NULL);
 
        msgfile = folder->klass->fetch_msg(folder, item, num);
 
@@ -2160,7 +2191,8 @@ gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
        MsgInfo *msginfo;
 
        g_return_val_if_fail(item != NULL, NULL);
-
+       g_return_val_if_fail(item->no_select == FALSE, NULL);
+       
        folder = item->folder;
 
        if (folder->klass->fetch_msg_full == NULL)
@@ -2203,6 +2235,7 @@ gint folder_item_fetch_all_msg(FolderItem *item)
        gint total = 0;
 
        g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->no_select == FALSE, -1);
 
        debug_print("fetching all messages in %s ...\n", item->path);
        statusbar_print_all(_("Fetching all messages in %s ...\n"), item->path);
@@ -2342,6 +2375,8 @@ static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo
                item->unread_msgs++;
        if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
                item->unreadmarked_msgs++;
+       if (MSG_IS_MARKED(newmsginfo->flags))
+               item->marked_msgs++;
        item->total_msgs++;
 
        folder_item_update_freeze();
@@ -2364,6 +2399,9 @@ static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
                msginfo->folder->unread_msgs--;
        if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                msginfo->folder->unreadmarked_msgs--;
+       if (MSG_IS_MARKED(msginfo->flags))
+               item->marked_msgs--;
+
        msginfo->folder->total_msgs--;
 
        msginfo_update.msginfo = msginfo;
@@ -2405,6 +2443,7 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
         g_return_val_if_fail(dest != NULL, -1);
         g_return_val_if_fail(file_list != NULL, -1);
         g_return_val_if_fail(dest->folder != NULL, -1);
+       g_return_val_if_fail(dest->no_select == FALSE, -1);
 
         folder = dest->folder;
 
@@ -2475,25 +2514,6 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
 
         return lastnum;
 }
-
-/*
-gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
-{
-       Folder *folder;
-       gint num;
-
-       g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msginfo != NULL, -1);
-
-       folder = dest->folder;
-       if (dest->last_num < 0) folder->scan(folder, dest);
-
-       num = folder->move_msg(folder, dest, msginfo);
-       if (num > 0) dest->last_num = num;
-
-       return num;
-}
-*/
                
 FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest) 
 {
@@ -2504,7 +2524,7 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
        gchar *old_id, *new_id;
 
        mlist = folder_item_get_msg_list(src);
-
+       
        /* move messages */
        debug_print("Moving %s to %s\n", src->path, dest->path);
        new_item = folder_create_folder(dest, src->name);
@@ -2573,7 +2593,7 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
                if (tmp == src) {
                        return F_MOVE_FAILED_DEST_IS_CHILD;
                }
-               tmp = folder_item_parent(tmp);;
+               tmp = folder_item_parent(tmp);
        }
        
        tmp = folder_item_parent(src);
@@ -2633,6 +2653,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        gint num, lastnum = -1;
        gboolean folderscan = FALSE;
        GRelation *relation;
+       GSList *not_moved = NULL;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
@@ -2640,6 +2661,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        folder = dest->folder;
 
        g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
+       g_return_val_if_fail(dest->no_select == FALSE, -1);
 
        relation = g_relation_new(2);
        g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
@@ -2670,7 +2692,10 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                        MsgInfo * msginfo = (MsgInfo *) l->data;
 
                        num = folder->klass->copy_msg(folder, dest, msginfo);
-                       g_relation_insert(relation, msginfo, GINT_TO_POINTER(num));
+                       if (num > 0)
+                               g_relation_insert(relation, msginfo, GINT_TO_POINTER(num));
+                       else
+                               not_moved = g_slist_prepend(not_moved, msginfo);
                }
        }
 
@@ -2751,6 +2776,9 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                        num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
                        g_tuples_destroy(tuples);
 
+                       if (g_slist_find(not_moved, msginfo))
+                               continue;
+
                        if ((num >= 0) && (item->folder->klass->remove_msg != NULL)) {
                                if (!item->folder->klass->remove_msgs)
                                        item->folder->klass->remove_msg(item->folder,
@@ -2848,6 +2876,7 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
        g_return_val_if_fail(item != NULL, -1);
        folder = item->folder;
        g_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
+       g_return_val_if_fail(item->no_select == FALSE, -1);
 
        if (!item->cache) folder_item_read_cache(item);
 
@@ -2870,6 +2899,7 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
        g_return_val_if_fail(item != NULL, -1);
        folder = item->folder;
        g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(item->no_select == FALSE, -1);
        inc_lock();
        if (!item->cache) folder_item_read_cache(item);
 
@@ -2904,6 +2934,7 @@ gint folder_item_remove_all_msg(FolderItem *item)
        gint result;
 
        g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->no_select == FALSE, -1);
 
        folder = item->folder;
 
@@ -2927,6 +2958,7 @@ gint folder_item_remove_all_msg(FolderItem *item)
                item->new_msgs = 0;
                item->unread_msgs = 0;
                item->unreadmarked_msgs = 0;
+               item->marked_msgs = 0;
                item->total_msgs = 0;
                folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
        }
@@ -2939,6 +2971,7 @@ void folder_item_change_msg_flags(FolderItem *item, MsgInfo *msginfo, MsgPermFla
 {
        g_return_if_fail(item != NULL);
        g_return_if_fail(msginfo != NULL);
+       g_return_if_fail(item->no_select == FALSE);
        
        if (item->folder->klass->change_flags != NULL) {
                item->folder->klass->change_flags(item->folder, item, msginfo, newflags);
@@ -2952,6 +2985,7 @@ gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
        Folder *folder;
 
        g_return_val_if_fail(item != NULL, FALSE);
+       g_return_val_if_fail(item->no_select == FALSE, FALSE);
 
        folder = item->folder;
 
@@ -3378,7 +3412,7 @@ void folder_item_apply_processing(FolderItem *item)
        gchar buf[32];
 
        g_return_if_fail(item != NULL);
-       
+       g_return_if_fail(item->no_select == FALSE);     
        processing_list = item->prefs->processing;
 
        folder_item_update_freeze();