0.9.5claws4

* src/compose.c
* src/rfc2015.c
* src/common/utils.h
        fix last sync

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 98323adbe4d5df9d47a68a61de5a12d0f0d70a80..f872438ae7a5f7d1a35c123acc76490bafba98e2 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2003-09-11 [christoph] 0.9.5claws4
+
+       * src/compose.c
+       * src/rfc2015.c
+       * src/common/utils.h
+               fix last sync
+
 2003-09-11 [paul]      0.9.5claws3
 
        * sync with 0.9.5cvs4

diff --git a/configure.ac b/configure.ac
index 3cba4fa5a5b3cfd30fef5c001def0d301f0cc13d..4f2aa58e27e5538533ee9ddac8e146e1a5c8f17a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/common/utils.h b/src/common/utils.h
index 629fd219fe7d4035eebdda320884ee846c355f96..1c0254d69c5c6c5eb7917a3a960bd09bd3e03a51 100644 (file)
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -427,6 +427,6 @@ gint g_stricase_equal       (gconstpointer gptr1, gconstpointer gptr2);
 gint g_int_compare     (gconstpointer a, gconstpointer b);
 
 gchar *generate_msgid          (const gchar *address, gchar *buf, gint len);
-gchar *generate_mime_boundary  (void);
+gchar *generate_mime_boundary  (const gchar *prefix);
 
 #endif /* __UTILS_H__ */

diff --git a/src/compose.c b/src/compose.c
index df9d2f1432cdac082f8fd78f7d572bdaae91cb54..6e8793991d1a0cd6e43489013386443e591388e2 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -4287,7 +4287,7 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
        /* MIME */
        fprintf(fp, "Mime-Version: 1.0\n");
        if (compose_use_attach(compose)) {
-               compose->boundary = generate_mime_boundary();
+               compose->boundary = generate_mime_boundary(NULL);
                fprintf(fp,
                        "Content-Type: multipart/mixed;\n"
                        " boundary=\"%s\"\n", compose->boundary);

diff --git a/src/rfc2015.c b/src/rfc2015.c
index 36cda74a18f5e09d6739329d8c44695152da58f8..d90d1dba141326d6f8fa141292e0f2437d7f7185 100644 (file)
--- a/src/rfc2015.c
+++ b/src/rfc2015.c
@@ -829,7 +829,7 @@ rfc2015_encrypt (const char *file, GSList *recp_list, gboolean ascii_armored)
     GpgmeRecipients rset = NULL;
     size_t nread;
     int mime_version_seen = 0;
-    char *boundary = generate_mime_boundary ();
+    char *boundary = generate_mime_boundary ("Encrypt");
 
     /* Create the list of recipients */
     rset = gpgmegtk_recipient_selection (recp_list);
@@ -1161,7 +1161,7 @@ rfc2015_sign (const char *file, GSList *key_list)
     GpgmeData sigdata = NULL;
     size_t nread;
     int mime_version_seen = 0;
-    char *boundary = generate_mime_boundary ();
+    char *boundary = generate_mime_boundary ("Signature");
     char *micalg = NULL;
     char *siginfo;