force attaching of specific types on forwarding even if filename is unspecified.

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

5 files changed, 18 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 0da28817..787d5c99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-01-24
 
+	* src/compose.c: compose_attach_parts(): force attaching of specific
+	  types even if filename is unspecified.
+	  src/procmime.[ch]: added MIME_VIDEO to ContentType.
+
+2006-01-24
+
 	* src/foldersel.c: place dialog at the center on parent window.
 
 2006-01-24
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 89739d1b..858bef36 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
 2006-01-24
 
+	* src/compose.c: compose_attach_parts(): ファイル名が指定されていない
+	  場合でも特定のタイプの添付を強制するようにした。
+	  src/procmime.[ch]: MIME_VIDEO を ContentType に追加。
+
+2006-01-24
+
 	* src/foldersel.c: ダイアログを親ウィンドウの中央に配置。
 
 2006-01-24
diff --git a/libsylph/procmime.c b/libsylph/procmime.c
index 13df59bd..5b6ed438 100644
--- a/libsylph/procmime.c
+++ b/libsylph/procmime.c
@@ -1033,6 +1033,8 @@ ContentType procmime_scan_mime_type(const gchar *mime_type)
 		type = MIME_IMAGE;
 	else if (!g_ascii_strncasecmp(mime_type, "audio/", 6))
 		type = MIME_AUDIO;
+	else if (!g_ascii_strncasecmp(mime_type, "video/", 6))
+		type = MIME_VIDEO;
 	else if (!g_ascii_strcasecmp(mime_type, "text"))
 		type = MIME_TEXT;
 	else
diff --git a/libsylph/procmime.h b/libsylph/procmime.h
index 722bc88f..5fd3a3a4 100644
--- a/libsylph/procmime.h
+++ b/libsylph/procmime.h
@@ -53,6 +53,7 @@ typedef enum
 	MIME_MULTIPART,
 	MIME_IMAGE,
 	MIME_AUDIO,
+	MIME_VIDEO,
 	MIME_UNKNOWN
 } ContentType;
 
diff --git a/src/compose.c b/src/compose.c
index 071cbd7b..4163a7f4 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1987,6 +1987,9 @@ static void compose_attach_parts(Compose *compose, MsgInfo *msginfo)
 		if (child->children || child->mime_type == MIME_MULTIPART)
 			goto next;
 		if (child->mime_type != MIME_MESSAGE_RFC822 &&
+		    child->mime_type != MIME_IMAGE &&
+		    child->mime_type != MIME_AUDIO &&
+		    child->mime_type != MIME_VIDEO &&
 		    !child->filename && !child->name)
 			goto next;