2006-05-29 [paul] 2.2.0cvs63

[claws.git] / src / mh.c

diff --git a/src/mh.c b/src/mh.c
index 85e89aebd1bcf654b5ad41ca54d218701dbcebc2..7035ccaa43d5492da0eb60b41bb8c628297bf38e 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -465,6 +465,7 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
        MsgInfoList *cur = NULL;
        gint curnum = 0, total = 0;
        gchar *srcpath = NULL;
        MsgInfoList *cur = NULL;
        gint curnum = 0, total = 0;
        gchar *srcpath = NULL;

+       gboolean full_fetch = FALSE;

 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);


@@ -478,6 +479,9 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
                return -1;
        }
 
                return -1;
        }
 

+       if (msginfo->folder->folder != dest->folder)
+               full_fetch = TRUE;
+

        if (dest->last_num < 0) {
                mh_get_last_num(folder, dest);
                if (dest->last_num < 0) return -1;
        if (dest->last_num < 0) {
                mh_get_last_num(folder, dest);
                if (dest->last_num < 0) return -1;


@@ -513,7 +517,13 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
                if (!msginfo) {
                        goto err_reset_status;
                }
                if (!msginfo) {
                        goto err_reset_status;
                }

-               srcfile = g_strconcat(srcpath, G_DIR_SEPARATOR_S, itos(msginfo->msgnum), NULL);
+               if (!full_fetch) {
+                       srcfile = g_strconcat(srcpath, 
+                               G_DIR_SEPARATOR_S, 
+                               itos(msginfo->msgnum), NULL);
+               } else {
+                       srcfile = procmsg_get_message_file(msginfo);
+               }

                if (!srcfile) {
                        goto err_reset_status;
                }
                if (!srcfile) {
                        goto err_reset_status;
                }