drop pgp-signature when reediting queued signed messages

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 748241f75084e83734da70b058bc39d09a7b750d..52d3295e512833c13fbad579f2bf304399dfac4b 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-09-23 [colin]     0.83claws15
+
+       * src/compose.c
+               Drop pgp-signature when reediting a signed queued
+               message
+
 2002-09-23 [melvin]    0.8.3claws14
 
        * po/fr.po

diff --git a/configure.in b/configure.in
index 94b6eed4f4c7f3694f1e51e53b1526aed987a509..caf6fe9044847d9af3d7e23dfed54d3f3ed31dc8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ MINOR_VERSION=8
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws12
+EXTRA_VERSION=claws15
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index b50e1f215b5d76e526ae26cc38bbaf65a1fae3a0..201f04a3f3c38967fca038f50535ba553b1da5f4 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2043,6 +2043,7 @@ static void compose_attach_parts(Compose *compose, MsgInfo *msginfo)
                procmime_mimeinfo_free_all(mimeinfo);
                return;
        }
+
        if (IS_FIRST_PART_TEXT(child))
                child = child->next;
 
@@ -2053,11 +2054,17 @@ static void compose_attach_parts(Compose *compose, MsgInfo *msginfo)
                        child = procmime_mimeinfo_next(child);
                        continue;
                }
-
+               if(child->parent && child->parent->parent
+               && !strcasecmp(child->parent->parent->content_type, "multipart/signed")
+               && child->mime_type == MIME_TEXT) {
+                       /* this is the main text part of a signed message */
+                       child = procmime_mimeinfo_next(child);
+                       continue;
+               }
                outfile = procmime_get_tmp_file_name(child);
                if (procmime_get_part(outfile, infile, child) < 0)
                        g_warning(_("Can't get the part of multipart message."));
-               else
+               else if (compose->mode != COMPOSE_REEDIT || strcmp(child->content_type, "application/pgp-signature"))
                        compose_attach_append
                                (compose, outfile,
                                 child->filename ? child->filename : child->name,