Make procmsg_msginfo_free() zero out pointers to freed memory.

[claws.git] / src / folderutils.c

diff --git a/src/folderutils.c b/src/folderutils.c
index 181e88e67dfcc9edb959d1b76e3599b8dbb175f7..0a272292f4ea17827a14aa93f99cf3fe088d2530 100644 (file)
--- a/src/folderutils.c
+++ b/src/folderutils.c
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2006 Hiroyuki Yamamoto & The Sylpheed-Claws Team
+ * Copyright (C) 2004-2012 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include <glib.h>
@@ -58,9 +58,9 @@ gint folderutils_delete_duplicates(FolderItem *item,
                else {
                        if ((MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_UNREAD(msginfo_dup->flags)) || 
                            (MSG_IS_UNREAD(msginfo->flags) == MSG_IS_UNREAD(msginfo_dup->flags))) {
-                               duplist = g_slist_append(duplist, msginfo);
+                               duplist = g_slist_prepend(duplist, msginfo);
                        } else {
-                               duplist = g_slist_append(duplist, msginfo_dup);
+                               duplist = g_slist_prepend(duplist, msginfo_dup);
                                g_hash_table_insert(table, msginfo->msgid, msginfo);
                        }
                }
@@ -91,7 +91,8 @@ gint folderutils_delete_duplicates(FolderItem *item,
                                MsgInfo *msginfo = (MsgInfo *) cur->data;
 
                                procmsg_msginfo_set_to_folder(msginfo, NULL);
-                               procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
+                               procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, 
+                                       MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
                                procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
                        }
                        break;
@@ -107,7 +108,7 @@ gint folderutils_delete_duplicates(FolderItem *item,
        for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
                MsgInfo *msginfo = (MsgInfo *) cur->data;
 
-               procmsg_msginfo_free(msginfo);
+               procmsg_msginfo_free(&msginfo);
        }
        g_slist_free(msglist);
 
@@ -122,16 +123,19 @@ void folderutils_mark_all_read(FolderItem *item)
 {
        MsgInfoList *msglist, *cur;
        MainWindow *mainwin = mainwindow_get_mainwindow();
-
-       g_return_if_fail(item != NULL);
+       int i = 0, m = 0;
+       debug_print("marking all read in item %s\n", (item==NULL)?"NULL":item->name);
+       cm_return_if_fail(item != NULL);
 
 
        folder_item_update_freeze();
        if (mainwin && mainwin->summaryview &&
            mainwin->summaryview->folder_item == item) {
+               debug_print("folder opened, using summary\n");
                summary_mark_all_read(mainwin->summaryview);
        } else {
                msglist = folder_item_get_msg_list(item);
+               debug_print("got msglist %p\n", msglist);
                if (msglist == NULL) {
                        folder_item_update_thaw();
                        return;
@@ -140,14 +144,41 @@ void folderutils_mark_all_read(FolderItem *item)
                for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
                        MsgInfo *msginfo = cur->data;
 
-                       if (msginfo->flags.perm_flags & (MSG_NEW | MSG_UNREAD))
+                       if (msginfo->flags.perm_flags & (MSG_NEW | MSG_UNREAD)) {
                                procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
-                       procmsg_msginfo_free(msginfo);
+                               m++;
+                       }
+                       i++;
+                       procmsg_msginfo_free(&msginfo);
                }
                folder_item_set_batch(item, FALSE);
                folder_item_close(item);
-
+               debug_print("marked %d messages out of %d as read\n", m, i);
                g_slist_free(msglist);
        }
        folder_item_update_thaw();
 }
+
+void folderutils_mark_all_read_recursive(FolderItem *item)
+{
+       GNode *node;
+
+       cm_return_if_fail(item != NULL);
+
+       folderutils_mark_all_read(item);
+
+       cm_return_if_fail(item->folder != NULL);
+       cm_return_if_fail(item->folder->node != NULL);
+
+       node = item->folder->node;
+       node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+       node = node->children;
+
+       while (node != NULL) {
+               if (node->data != NULL) {
+                       FolderItem *sub_item = (FolderItem *) node->data;
+                       node = node->next;
+                       folderutils_mark_all_read_recursive(sub_item);
+               }
+       }
+}