2006-05-29 [paul] 2.2.0cvs63

	* src/mh.c
		fetch full message when moving mails
		from another mailbox, (fixed data loss
		when filtering from IMAP to MH, introduced
		in 2.2.0cvs57).
		Thanks to Colin

diff --git a/ChangeLog b/ChangeLog
index 253dc5dae8a75871c1c449494ba86524ea457f27..ca540c897967f38ab7dbff38f5f983f88c473f82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-29 [paul]      2.2.0cvs63
+
+       * src/mh.c
+               fetch full message when moving mails
+               from another mailbox, (fixed data loss
+               when filtering from IMAP to MH, introduced
+               in 2.2.0cvs57).
+               Thanks to Colin
+

 2006-05-29 [mones]     2.2.0cvs62
 
        * src/gtk/gtksctree.c
 2006-05-29 [mones]     2.2.0cvs62
 
        * src/gtk/gtksctree.c

diff --git a/PATCHSETS b/PATCHSETS
index 8c2757dce333bc89eaef39182e4e1bdef47ff70b..a845aaa77a229362e12d769b7823bcade66c9f15 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1532,3 +1532,4 @@
 ( cvs diff -u -r 1.26.2.25 -r 1.26.2.26 src/foldersel.c;  ) > 2.2.0cvs60.patchset
 ( cvs diff -u -r 1.395.2.210 -r 1.395.2.211 src/summaryview.c;  ) > 2.2.0cvs61.patchset
 ( cvs diff -u -r 1.1.4.19 -r 1.1.4.20 src/gtk/gtksctree.c;  ) > 2.2.0cvs62.patchset
 ( cvs diff -u -r 1.26.2.25 -r 1.26.2.26 src/foldersel.c;  ) > 2.2.0cvs60.patchset
 ( cvs diff -u -r 1.395.2.210 -r 1.395.2.211 src/summaryview.c;  ) > 2.2.0cvs61.patchset
 ( cvs diff -u -r 1.1.4.19 -r 1.1.4.20 src/gtk/gtksctree.c;  ) > 2.2.0cvs62.patchset

+( cvs diff -u -r 1.79.2.32 -r 1.79.2.33 src/mh.c;  ) > 2.2.0cvs63.patchset

diff --git a/configure.ac b/configure.ac
index ac7c0679c58bc1d05180f8aa27a8408a10f865be..53164731158eab956aa2a84f4c2e1f9c93d330c1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=62
+EXTRA_VERSION=63

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

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;
                }