include message/rfc822 parts when forwarding.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@860 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f6845f09..e9c79365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-12-25
 
+	* src/compose.c: compose_attach_parts(): include message/rfc822 parts.
+
+2005-12-25
+
 	* src/folderview.c: fixed a bug that previously selected row was
 	  removed from the view instead of currently selected one when
 	  deleting/renaming folders from the context menu.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 48e2e6fb..70ce5634 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2005-12-25
 
+	* src/compose.c: compose_attach_parts(): message/rfc822 パートも
+	  含めるようにした。
+
+2005-12-25
+
 	* src/folderview.c: コンテキストメニューからフォルダを削除/リネーム
 	  したときに現在選択されている行でなく以前選択されていた行がビュー
 	  から削除されていたバグを修正。
diff --git a/src/compose.c b/src/compose.c
index 7cc78c65..6df784aa 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1986,7 +1986,8 @@ static void compose_attach_parts(Compose *compose, MsgInfo *msginfo)
 	     child = procmime_mimeinfo_next(child)) {
 		if (child->children || child->mime_type == MIME_MULTIPART)
 			continue;
-		if (!child->filename && !child->name)
+		if (child->mime_type != MIME_MESSAGE_RFC822 &&
+		    !child->filename && !child->name)
 			continue;
 
 		outfile = procmime_get_tmp_file_name(child);