* src/folder.c

[claws.git] / src / folder.c

diff --git a/src/folder.c b/src/folder.c
index a572f4172addc5d704984970f95e0797f5208453..2a61cc49695906838a7beb64ed0eb149dba9d2b2 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -970,7 +970,6 @@ void folder_item_close(FolderItem *item)
        g_return_if_fail(item != NULL);
        
        mlist = folder_item_get_msg_list(item);
-       
        for (cur = mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo;
 
@@ -979,10 +978,12 @@ void folder_item_close(FolderItem *item)
                        procmsg_msginfo_unset_flags(msginfo, MSG_NEW, 0);
                procmsg_msginfo_free(msginfo);
        }
+       g_slist_free(mlist);
+
+       folder_item_write_cache(olditem);
        
        folder_update_item(item, FALSE);
 
-       g_slist_free(mlist);
 }
 
 gint folder_item_scan(FolderItem *item)
@@ -1520,12 +1521,14 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
        for (cur = mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo;
                cnt++;
-               msginfo = (MsgInfo *) cur->data;
-               folder_item_move_msg(new_item, msginfo);
                if (cnt%500)
                        statusbar_print_all(_("Moving %s to %s (%d%%)..."), src->name, 
                                        new_item->path,
                                        100*cnt/g_slist_length(mlist));
+               msginfo = (MsgInfo *) cur->data;
+               folder_item_move_msg(new_item, msginfo);
+               if (cnt%500)
+                       statusbar_pop_all();
        }
        
        /*copy prefs*/
@@ -1596,7 +1599,7 @@ FolderItem *folder_item_move_to(FolderItem *src, FolderItem *dest)
        }
        debug_print("moving \"%s\" to \"%s\"\n", phys_srcpath, phys_dstpath);
        if ((tmp = folder_item_move_recursive(src, dest)) == NULL) {
-               alertpanel_error(_("Move failed !"));
+               alertpanel_error(_("Move failed!"));
                return NULL;
        }
        
@@ -1606,7 +1609,7 @@ FolderItem *folder_item_move_to(FolderItem *src, FolderItem *dest)
        if (src_node) 
                g_node_destroy(src_node);
        else
-               debug_print("can't remove node: is null !\n");
+               debug_print("can't remove node: it's null!\n");
        /* not to much worry if remove fails, move has been done */
        
        debug_print("updating rules ....\n");
@@ -2336,6 +2339,13 @@ static gchar *folder_get_list_path(void)
        return filename;
 }
 
+#define PUT_ESCAPE_STR(fp, attr, str)                  \
+{                                                      \
+       fputs(" " attr "=\"", fp);                      \
+       xml_file_put_escape_str(fp, str);               \
+       fputs("\"", fp);                                \
+}
+
 static void folder_write_list_recursive(GNode *node, gpointer data)
 {
        FILE *fp = (FILE *)data;
@@ -2361,17 +2371,11 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                Folder *folder = item->folder;
 
                fprintf(fp, "<folder type=\"%s\"", folder_type_str[folder->type]);
-               if (folder->name) {
-                       fputs(" name=\"", fp);
-                       xml_file_put_escape_str(fp, folder->name);
-                       fputs("\"", fp);
-               }
-               if ((folder->type == F_MH) || (folder->type == F_MBOX)) {
-                       fputs(" path=\"", fp);
-                       xml_file_put_escape_str
-                               (fp, LOCAL_FOLDER(folder)->rootpath);
-                       fputs("\"", fp);
-               }
+               if (folder->name)
+                       PUT_ESCAPE_STR(fp, "name", folder->name);
+               if (folder->type == F_MH || folder->type == F_MBOX)
+                       PUT_ESCAPE_STR(fp, "path",
+                                      LOCAL_FOLDER(folder)->rootpath);
                if (item->collapsed && node->children)
                        fputs(" collapsed=\"1\"", fp);
                if (folder->account)
@@ -2384,17 +2388,11 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
        } else {
                fprintf(fp, "<folderitem type=\"%s\"",
                        folder_item_stype_str[item->stype]);
-               if (item->name) {
-                       fputs(" name=\"", fp);
-                       xml_file_put_escape_str(fp, item->name);
-                       fputs("\"", fp);
-               }
-               if (item->path) {
-                       fputs(" path=\"", fp);
-                       xml_file_put_escape_str(fp, item->path);
-                       fputs("\"", fp);
-               }
-               
+               if (item->name)
+                       PUT_ESCAPE_STR(fp, "name", item->name);
+               if (item->path)
+                       PUT_ESCAPE_STR(fp, "path", item->path);
+
                if (item->no_sub)
                        fputs(" no_sub=\"1\"", fp);
                if (item->no_select)
@@ -2424,7 +2422,7 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                fprintf(fp,
                        " mtime=\"%lu\" new=\"%d\" unread=\"%d\" total=\"%d\"",
                        item->mtime, item->new, item->unread, item->total);
-                       
+
                if (item->account)
                        fprintf(fp, " account_id=\"%d\"",
                                item->account->account_id);
@@ -2685,6 +2683,9 @@ void folder_item_apply_processing(FolderItem *item)
        g_slist_free(mlist);
 }
 
+/*
+ *  Callback handling for FolderItem content changes
+ */
 GSList *folder_item_update_callbacks_list = NULL;
 gint   folder_item_update_callbacks_nextid = 0;
 
@@ -2749,12 +2750,10 @@ void folder_update_item(FolderItem *item, gboolean contentchange)
        folder_item_update_callback_execute(item, contentchange);
 }
 
-static void folder_update_item_func(FolderItem *item, gpointer data)
+static void folder_update_item_func(FolderItem *item, gpointer contentchange)
 {
-       gboolean contentchange = GPOINTER_TO_INT(data);
-       
        if (item->need_update) {
-               folder_item_update_callback_execute(item, contentchange);
+               folder_item_update_callback_execute(item, GPOINTER_TO_INT(contentchange));
                item->need_update = FALSE;
        }
 }
@@ -2778,3 +2777,5 @@ void folder_update_item_recursive(FolderItem *item, gboolean update_summary)
                node = node->next;
        }
 }
+
+#undef PUT_ESCAPE_STR