From 757b71d95bb56cf7d1e69f116916bd1ee4f223e0 Mon Sep 17 00:00:00 2001
From: Christoph Hohmann <reboot@gmx.ch>
Date: Mon, 28 Jul 2003 22:30:01 +0000
Subject: [PATCH] 0.9.3claws68

* src/folder.c
* src/imap.c
* src/mh.c
* src/procmsg.[ch]
        fix copy to IMAP folder from other folder
---
 ChangeLog.claws | 8 ++++++++
 configure.ac    | 2 +-
 src/folder.c    | 1 +
 src/imap.c      | 5 ++++-
 src/mh.c        | 2 +-
 src/procmsg.c   | 2 ++
 src/procmsg.h   | 1 +
 7 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index bb3a58222..0447d8bf3 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2003-07-28 [christoph]	0.9.3claws68
+
+	* src/folder.c
+	* src/imap.c
+	* src/mh.c
+	* src/procmsg.[ch]
+		fix copy to IMAP folder from other folder
+
 2003-07-28 [christoph]	0.9.3claws67
 
 	* src/procmsg.c
diff --git a/configure.ac b/configure.ac
index 09928f933..4ff5b1523 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=67
+EXTRA_VERSION=68
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
diff --git a/src/folder.c b/src/folder.c
index 8b5eb74c3..2e7169322 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -1670,6 +1670,7 @@ gint folder_item_add_msg(FolderItem *dest, const gchar *file,
 	g_return_val_if_fail(dest != NULL, -1);
 	g_return_val_if_fail(file != NULL, -1);
  
+	fileinfo.msginfo = NULL;
         fileinfo.file = (gchar *)file;
         fileinfo.flags = flags;
         file_list.data = &fileinfo;
diff --git a/src/imap.c b/src/imap.c
index d5496b2ea..10ea45dcd 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -801,6 +801,7 @@ gint imap_add_msg(Folder *folder, FolderItem *dest, const gchar *file, MsgFlags
 
 	g_return_val_if_fail(file != NULL, -1);
 
+	fileinfo.msginfo = NULL;
 	fileinfo.file = (gchar *)file;
 	fileinfo.flags = flags;
 	file_list.data = &fileinfo;
@@ -858,7 +859,9 @@ gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
 		}
 
 		if (relation != NULL)
-			g_relation_insert(relation, fileinfo, GINT_TO_POINTER(newnum));
+			g_relation_insert(relation, fileinfo->msginfo != NULL ? 
+					  fileinfo->msginfo : fileinfo,
+					  GINT_TO_POINTER(dest->last_num + 1));
 		if (newnum > last_uid)
 			last_uid = newnum;
 	}
diff --git a/src/mh.c b/src/mh.c
index 95cd75f1c..b7b95da05 100644
--- a/src/mh.c
+++ b/src/mh.c
@@ -319,6 +319,7 @@ gint mh_add_msg(Folder *folder, FolderItem *dest, const gchar *file, MsgFlags *f
 
 	g_return_val_if_fail(file != NULL, -1);
 
+	fileinfo.msginfo = NULL;
 	fileinfo.file = (gchar *)file;
 	fileinfo.flags = flags;
 	file_list.data = &fileinfo;
@@ -359,7 +360,6 @@ gint mh_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
 		}
 		if (relation != NULL)
 			g_relation_insert(relation, fileinfo, GINT_TO_POINTER(dest->last_num + 1));
-
 		g_free(destfile);
 		dest->last_num++;
 	}
diff --git a/src/procmsg.c b/src/procmsg.c
index 0a015fc1f..19cd88783 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -397,6 +397,7 @@ GSList *procmsg_get_message_file_list(GSList *mlist)
                         return NULL;
                 }
                 fileinfo = g_new(MsgFileInfo, 1);
+		fileinfo->msginfo = procmsg_msginfo_new_ref(msginfo);
                 fileinfo->file = file;
                 fileinfo->flags = g_new(MsgFlags, 1);
                 *fileinfo->flags = msginfo->flags;
@@ -416,6 +417,7 @@ void procmsg_message_file_list_free(MsgInfoList *file_list)
 
 	for (cur = file_list; cur != NULL; cur = cur->next) {
 		fileinfo = (MsgFileInfo *)cur->data;
+		procmsg_msginfo_free(fileinfo->msginfo);
 		g_free(fileinfo->file);
 		g_free(fileinfo->flags);
 		g_free(fileinfo);
diff --git a/src/procmsg.h b/src/procmsg.h
index db4223009..245308711 100644
--- a/src/procmsg.h
+++ b/src/procmsg.h
@@ -197,6 +197,7 @@ struct _MsgInfo
 
 struct _MsgFileInfo
 {
+	MsgInfo *msginfo;
         gchar *file;
         MsgFlags *flags;
 };
-- 
2.25.1