2005-02-10 [paul] 1.0.1cvs4
authorPaul Mangan <paul@claws-mail.org>
Thu, 10 Feb 2005 13:10:46 +0000 (13:10 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 10 Feb 2005 13:10:46 +0000 (13:10 +0000)
* src/compose.c
sync with main, see ChangeLog 2005-02-10

ChangeLog.claws
PATCHSETS
configure.ac
src/compose.c

index 8f7b7e1..b1a08a6 100644 (file)
@@ -1,3 +1,8 @@
+2005-02-10 [paul]      1.0.1cvs4
+
+       * src/compose.c
+               sync with main, see ChangeLog 2005-02-10
+
 2005-02-10 [colin]     1.0.1cvs3
 
        * src/mainwindow.c
index e0fb295..2215ec8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.133 -r 1.134 src/messageview.c; ) > 1.0.1cvs2.patchset
 ( cvs diff -u -r 1.317 -r 1.318 src/mainwindow.c; ) > 1.0.1cvs3.patchset
 
+( cvs diff -u -r 1.473 -r 1.474 src/compose.c; ) > 1.0.1cvs4.patchset
index fe440cb..3b44d32 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
index 0321454..b4d0ae1 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -3465,7 +3465,10 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
        /* protect trailing spaces when signing message */
        if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing && 
            privacy_system_can_sign(compose->privacy_system))
-               encoding = ENC_QUOTED_PRINTABLE;
+               if (encoding == ENC_7BIT)
+                       encoding = ENC_QUOTED_PRINTABLE;
+               else if (encoding == ENC_8BIT)
+                       encoding = ENC_BASE64;
        if (encoding != ENC_UNKNOWN)
                procmime_encode_content(mimetext, encoding);