2005-02-15 [colin] 1.0.1cvs7.1
authorColin Leroy <colin@colino.net>
Tue, 15 Feb 2005 07:41:11 +0000 (07:41 +0000)
committerColin Leroy <colin@colino.net>
Tue, 15 Feb 2005 07:41:11 +0000 (07:41 +0000)
* src/compose.c
* src/procmime.c
Sync with HEAD

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/compose.c
src/procmime.c

index 074e94f..05d79cb 100644 (file)
@@ -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
index 863cdeb..28de595 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 9dab42c..265ddf5 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=7
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
index 70b5e10..07a9a15 100644 (file)
@@ -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) {
-               if (!strncmp(buf, "From ", strlen("From ")) ||
+               if (!strncmp(buf, "From ", sizeof("From ")-1) ||
                    strstr(buf, "\nFrom ") != NULL) {
                        encoding = ENC_QUOTED_PRINTABLE;
                }
index a4267d7..3067893 100644 (file)
@@ -478,10 +478,10 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
                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;
                                
-                               tmpbuf += strlen("From ");
+                               tmpbuf += sizeof("From ")-1;
                                
                                fputs("=46rom ", outfp);
                                fputs(tmpbuf, outfp);