2006-01-25 [colin] 1.9.100cvs187

	* src/imap.c
		Don't allow moving/copying mails between
		queue/drafts and non-queue/drafts folders
		Fixes bug #897 (message header is resetted
		if one is copied to Drafts)

diff --git a/ChangeLog b/ChangeLog
index 976516a95fdbaedbc493aac7bd5f602746ba7afa..43919e312c7463e3e07e7e72bc4e9359a900b51c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-25 [colin]     1.9.100cvs187
+
+       * src/imap.c
+               Don't allow moving/copying mails between
+               queue/drafts and non-queue/drafts folders
+               Fixes bug #897 (message header is resetted 
+               if one is copied to Drafts)
+
 2006-01-25 [colin]     1.9.100cvs186
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index a2da9fc38015de74b2724c01865e60606d187e27..30144cfab32d903ada09a6ea486509c7ce35aa3b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1170,3 +1170,4 @@
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/glossary.xml;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/keyboard.xml;  cvs diff -u -r 1.60.2.23 -r 1.60.2.24 po/es.po;  ) > 1.9.100cvs184.patchset
 ( cvs diff -u -r 1.100.2.33 -r 1.100.2.34 AUTHORS;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 po/Makevars;  cvs diff -u -r 1.58.2.18 -r 1.58.2.19 po/de.po;  cvs diff -u -r 1.10.2.8 -r 1.10.2.9 po/pl.po;  cvs diff -u -r 1.50.2.14 -r 1.50.2.15 po/pt_BR.po;  cvs diff -u -r 1.17.2.16 -r 1.17.2.17 po/sr.po;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/authors.h;  ) > 1.9.100cvs185.patchset
 ( cvs diff -u -r 1.213.2.77 -r 1.213.2.78 src/folder.c;  cvs diff -u -r 1.274.2.92 -r 1.274.2.93 src/mainwindow.c;  cvs diff -u -r 1.382.2.229 -r 1.382.2.230 src/compose.c;  ) > 1.9.100cvs186.patchset
+( cvs diff -u -r 1.179.2.89 -r 1.179.2.90 src/imap.c;  ) > 1.9.100cvs187.patchset

diff --git a/configure.ac b/configure.ac
index 293754e045c1fe59a18db2154a429966d714cfd2..4e81f99bac233460fa6e194900614e76dfc9f06a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=186
+EXTRA_VERSION=187
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/imap.c b/src/imap.c
index 924ee819b941bd52c10208064a4d1aa665a973cb..a6c85809495291b7b2115040b4f8ca2475eec516 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -1069,6 +1069,11 @@ static gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
                                        unlock_session();
                                        return -1;
                                }
+                       }  else if (!(MSG_IS_QUEUED(*fileinfo->flags) 
+                                     || MSG_IS_DRAFT(*fileinfo->flags))
+                                   && (folder_has_parent_of_type(dest, F_QUEUE)
+                                   || folder_has_parent_of_type(dest, F_DRAFT))) {
+                               return -1;
                        } 
                }
                if (real_file == NULL)
@@ -1242,18 +1247,28 @@ static gint imap_copy_msgs(Folder *folder, FolderItem *dest,
        msginfo = (MsgInfo *)msglist->data;
        g_return_val_if_fail(msginfo->folder != NULL, -1);
 
+       /* if from/to are the same "type" (with or without extra headers),
+        * copy them via imap */
        if (folder == msginfo->folder->folder &&
            !folder_has_parent_of_type(msginfo->folder, F_DRAFT) &&
-           !folder_has_parent_of_type(msginfo->folder, F_QUEUE)) {
+           !folder_has_parent_of_type(msginfo->folder, F_QUEUE) &&
+           !folder_has_parent_of_type(dest, F_DRAFT) &&
+           !folder_has_parent_of_type(dest, F_QUEUE)) {
+               ret = imap_do_copy_msgs(folder, dest, msglist, relation);
+               return ret;
+       } else if (folder == msginfo->folder->folder &&
+           (folder_has_parent_of_type(msginfo->folder, F_DRAFT) ||
+            folder_has_parent_of_type(msginfo->folder, F_QUEUE)) && 
+           (folder_has_parent_of_type(dest, F_DRAFT) ||
+            folder_has_parent_of_type(dest, F_QUEUE))) {
                ret = imap_do_copy_msgs(folder, dest, msglist, relation);
                return ret;
        }
-
+       /* else reupload them */
        file_list = procmsg_get_message_file_list(msglist);
        g_return_val_if_fail(file_list != NULL, -1);
 
        ret = imap_add_msgs(folder, dest, file_list, relation);
-
        procmsg_message_file_list_free(file_list);
 
        return ret;