diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.ja | 5 | ||||
| -rw-r--r-- | src/compose.c | 19 |
3 files changed, 16 insertions, 13 deletions
@@ -1,5 +1,10 @@ 2005-11-25 + * src/compose.c: compose_write_to_file(): always canonicalize composed + message. + +2005-11-25 + * libsylph/procmime.c: procmime_decode_content(): uncanonicalize unencoded text. diff --git a/ChangeLog.ja b/ChangeLog.ja index ad8e5f13..43de8098 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,10 @@ 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; } |