2005-02-15 [colin] 1.0.1cvs7.1

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

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

 2005-02-14 [colin]     1.0.1cvs6.1
 
        * src/compose.c
 2005-02-14 [colin]     1.0.1cvs6.1
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 863cdeb7cf62487d0fb7a5ae807130b852e7905a..28de59564ea84723161b4bb7bf1c4dfc41eec91a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -378,3 +378,4 @@
 ( 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
 ( 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

+( cvs diff -u -r 1.382.2.101 -r 1.382.2.102 src/compose.c; cvs diff -u -r 1.49.2.33 -r 1.49.2.34 src/procmime.c; ) > 1.0.1cvs7.1.patchset

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

-EXTRA_VERSION=6
+EXTRA_VERSION=7

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/compose.c b/src/compose.c
index 70b5e108b952e2eb8d491b7691d7513382962e2b..07a9a15a87352f1feac663e08c80a873fcd24aa9 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3644,7 +3644,7 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
        g_free(chars);
 
        if (encoding == ENC_8BIT || encoding == ENC_7BIT) {
        g_free(chars);
 
        if (encoding == ENC_8BIT || encoding == ENC_7BIT) {

-               if (!strncmp(buf, "From ", strlen("From ")) ||
+               if (!strncmp(buf, "From ", sizeof("From ")-1) ||

                    strstr(buf, "\nFrom ") != NULL) {
                        encoding = ENC_QUOTED_PRINTABLE;
                }
                    strstr(buf, "\nFrom ") != NULL) {
                        encoding = ENC_QUOTED_PRINTABLE;
                }

diff --git a/src/procmime.c b/src/procmime.c
index a4267d7438569f08f60d56044159a72e2b7de780..3067893297628bb0508b6900028236494a10a0a2 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -478,10 +478,10 @@ 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);
 

-                       if (!strncmp("From ", outbuf, strlen("From "))) {
+                       if (!strncmp("From ", outbuf, sizeof("From ")-1)) {

                                gchar *tmpbuf = outbuf;
                                
                                gchar *tmpbuf = outbuf;
                                

-                               tmpbuf += strlen("From ");
+                               tmpbuf += sizeof("From ")-1;

                                
                                fputs("=46rom ", outfp);
                                fputs(tmpbuf, outfp);
                                
                                fputs("=46rom ", outfp);
                                fputs(tmpbuf, outfp);