2005-02-14 [colin] 1.0.1cvs6.1

	* src/compose.c
	* src/procmime.c
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index fa444cb59c800d302c3c2a90aa91dd5a1f5a7dd4..074e94feadc025e8d7ad1403af1d1adb19d00cf7 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-02-14 [colin]     1.0.1cvs6.1
+
+       * src/compose.c
+       * src/procmime.c
+               Sync with HEAD
+

 2005-02-14 [colin]     1.0.1cvs5.3
 
        * src/compose.c
 2005-02-14 [colin]     1.0.1cvs5.3
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 4672e9e1ab2892153bfcb54e77d4f8349950bf1f..863cdeb7cf62487d0fb7a5ae807130b852e7905a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -377,3 +377,4 @@
 ( cvs diff -u -r 1.60.2.4 -r 1.60.2.5 src/filtering.c; ) > 1.0.1cvs5.1.patchset
 ( cvs diff -u -r 1.96.2.46 -r 1.96.2.47 src/textview.c; ) > 1.0.1cvs5.2.patchset
 ( cvs diff -u -r 1.382.2.99 -r 1.382.2.100 src/compose.c; ) > 1.0.1cvs5.3.patchset
 ( cvs diff -u -r 1.60.2.4 -r 1.60.2.5 src/filtering.c; ) > 1.0.1cvs5.1.patchset
 ( cvs diff -u -r 1.96.2.46 -r 1.96.2.47 src/textview.c; ) > 1.0.1cvs5.2.patchset
 ( cvs diff -u -r 1.382.2.99 -r 1.382.2.100 src/compose.c; ) > 1.0.1cvs5.3.patchset

+( cvs diff -u -r 1.382.2.100 -r 1.382.2.101 src/compose.c; cvs diff -u -r 1.49.2.32 -r 1.49.2.33 src/procmime.c; ) > 1.0.1cvs6.1.patchset

diff --git a/configure.ac b/configure.ac
index 7eda2517c2b8fb992cb00e5fb97c126a57150c58..9dab42c89215d86470f957ad6ae8ba3679f0bdfd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=5
+EXTRA_VERSION=6

 EXTRA_RELEASE=
 EXTRA_RELEASE=

-EXTRA_GTK2_VERSION=.3
+EXTRA_GTK2_VERSION=.1

 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/compose.c b/src/compose.c
index 67443e8e9a7df42c1f907f5988ba03489847c034..70b5e108b952e2eb8d491b7691d7513382962e2b 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3614,6 +3614,7 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
 
                if (action == COMPOSE_WRITE_FOR_SEND) {
                        buf = conv_codeset_strdup(chars, src_codeset, out_codeset);
 
                if (action == COMPOSE_WRITE_FOR_SEND) {
                        buf = conv_codeset_strdup(chars, src_codeset, out_codeset);

+                       

                        if (!buf) {
                                AlertValue aval;
                                gchar *msg;
                        if (!buf) {
                                AlertValue aval;
                                gchar *msg;


@@ -3642,6 +3643,13 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
        }
        g_free(chars);
 
        }
        g_free(chars);
 

+       if (encoding == ENC_8BIT || encoding == ENC_7BIT) {
+               if (!strncmp(buf, "From ", strlen("From ")) ||
+                   strstr(buf, "\nFrom ") != NULL) {
+                       encoding = ENC_QUOTED_PRINTABLE;
+               }
+       }
+

        mimetext = procmime_mimeinfo_new();
        mimetext->content = MIMECONTENT_MEM;
        mimetext->data.mem = buf;
        mimetext = procmime_mimeinfo_new();
        mimetext->content = MIMECONTENT_MEM;
        mimetext->data.mem = buf;

diff --git a/src/procmime.c b/src/procmime.c
index 1ad566ded26a96aab1520e88d6487fa433c1bd4d..a4267d7438569f08f60d56044159a72e2b7de780 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -477,7 +477,16 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
 
                while (fgets(inbuf, sizeof(inbuf), infp) != NULL) {
                        qp_encode_line(outbuf, inbuf);
 
                while (fgets(inbuf, sizeof(inbuf), infp) != NULL) {
                        qp_encode_line(outbuf, inbuf);

-                       fputs(outbuf, outfp);
+
+                       if (!strncmp("From ", outbuf, strlen("From "))) {
+                               gchar *tmpbuf = outbuf;
+                               
+                               tmpbuf += strlen("From ");
+                               
+                               fputs("=46rom ", outfp);
+                               fputs(tmpbuf, outfp);
+                       } else 
+                               fputs(outbuf, outfp);

                }
        } else {
                gchar buf[BUFFSIZE];
                }
        } else {
                gchar buf[BUFFSIZE];