diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-04-12 05:08:47 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-04-12 05:08:47 +0000 |
| commit | 92756e16f048184aec6bc0190c4e9b5fa20bed28 (patch) | |
| tree | 2a5909fdb82c476d7db143f6d9544389b4a76347 | |
| parent | 2147115dec26c80c0b941f75dc8139be1c653923 (diff) | |
don't encode clearsigned text.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@210 ee746299-78ed-0310-b773-934348b2243d
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.ja | 5 | ||||
| -rw-r--r-- | src/compose.c | 6 |
3 files changed, 15 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2005-04-12 + + * src/compose.c: compose_write_to_file(): don't encode clearsigned + text. + 2005-04-11 * src/action.c: catch_output(): correctly select the insert text diff --git a/ChangeLog.ja b/ChangeLog.ja index f02c3cb3..497ba8b3 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,3 +1,8 @@ +2005-04-12 + + * src/compose.c: compose_write_to_file(): クリア署名されたテキストを + エンコードしないようにした。 + 2005-04-11 * src/action.c: catch_output(): 挿入されたテキストを正しく選択する diff --git a/src/compose.c b/src/compose.c index c49cda0b..b685386b 100644 --- a/src/compose.c +++ b/src/compose.c @@ -2715,7 +2715,7 @@ static gint compose_write_to_file(Compose *compose, const gchar *file, #if USE_GPGME /* force encoding to protect trailing spaces */ - if (!is_draft && compose->use_signing) { + if (!is_draft && compose->use_signing && !compose->account->clearsign) { if (encoding == ENC_7BIT) encoding = ENC_QUOTED_PRINTABLE; else if (encoding == ENC_8BIT) @@ -2723,6 +2723,10 @@ static gint compose_write_to_file(Compose *compose, const gchar *file, } if (!is_draft && compose->use_signing && compose->account->clearsign) { + /* MIME encoding doesn't fit with cleartext signature */ + if (encoding == ENC_QUOTED_PRINTABLE || encoding == ENC_BASE64) + encoding = ENC_8BIT; + if (compose_clearsign_text(compose, &buf) < 0) { g_warning("clearsign failed\n"); fclose(fp); |