From 7a38bb7e688b1b3eb99ae090ede32ddbfba1de6d Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Fri, 25 Nov 2005 10:55:15 +0000
Subject: always canonicalize composed message.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@781 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog     |  5 +++++
 ChangeLog.ja  |  5 +++++
 src/compose.c | 19 ++++++-------------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 321989c7..47b4def9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-25
+
+	* src/compose.c: compose_write_to_file(): always canonicalize composed
+	  message.
+
 2005-11-25
 
 	* libsylph/procmime.c: procmime_decode_content(): uncanonicalize
diff --git a/ChangeLog.ja b/ChangeLog.ja
index ad8e5f13..43de8098 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2005-11-25
+
+	* src/compose.c: compose_write_to_file(): 作成したメッセージを常に
+	  正規化するようにした。
+
 2005-11-25
 
 	* libsylph/procmime.c: procmime_decode_content(): エンコードされて
diff --git a/src/compose.c b/src/compose.c
index 0e35f5ca..1ad4aea4 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -3013,19 +3013,14 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
 		return -1;
 	}
 
-#if USE_GPGME
-	if (!rfc2015_is_available() || is_draft) {
-		uncanonicalize_file_replace(file);
-		return 0;
+	if (canonicalize_file_replace(file) < 0) {
+		g_unlink(file);
+		return -1;
 	}
 
-	if ((compose->use_signing && !compose->account->clearsign) ||
-	    compose->use_encryption) {
-		if (canonicalize_file_replace(file) < 0) {
-			g_unlink(file);
-			return -1;
-		}
-	}
+#if USE_GPGME
+	if (!rfc2015_is_available() || is_draft)
+		return 0;
 
 	if (compose->use_signing && !compose->account->clearsign) {
 		GSList *key_list;
@@ -3045,8 +3040,6 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
 	}
 #endif /* USE_GPGME */
 
-	uncanonicalize_file_replace(file);
-
 	return 0;
 }
 
-- 
cgit v1.2.3