2007-01-12 [paul] 2.7.0cvs16
authorColin Leroy <colin@colino.net>
Fri, 12 Jan 2007 14:28:56 +0000 (14:28 +0000)
committerColin Leroy <colin@colino.net>
Fri, 12 Jan 2007 14:28:56 +0000 (14:28 +0000)
* src/compose.c
Strip S/MIME signatures when re-editing
S/MIME signed messages.

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index 4ef9daea4a81c29bd6ab353a154c8c3c361f7a49..3a9fef99e5fee08af1da0dfded6327bfbb973f09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-12 [paul]      2.7.0cvs16
+
+       * src/compose.c
+               Strip S/MIME signatures when re-editing
+               S/MIME signed messages.
+
 2007-01-12 [paul]      2.7.0cvs15
 
        * configure.ac
index c810b7b72e5ac787fa1b91dc2295e3724a3ec8cb..44e69f253349079cfeb6a31374efd6f27342c10f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.49.2.85 -r 1.49.2.86 src/procmime.c;  ) > 2.7.0cvs13.patchset
 ( cvs diff -u -r 1.83.2.97 -r 1.83.2.98 src/mimeview.c;  ) > 2.7.0cvs14.patchset
 ( cvs diff -u -r 1.654.2.2295 -r 1.654.2.2296 configure.ac;  cvs diff -u -r 1.60.2.74 -r 1.60.2.75 src/addressbook.c;  cvs diff -u -r 1.26.2.30 -r 1.26.2.31 src/foldersel.c;  cvs diff -u -r 1.207.2.141 -r 1.207.2.142 src/folderview.c;  cvs diff -u -r 1.115.2.122 -r 1.115.2.123 src/main.c;  ) > 2.7.0cvs15.patchset
+( cvs diff -u -r 1.382.2.350 -r 1.382.2.351 src/compose.c;  ) > 2.7.0cvs16.patchset
index c4984524e47002c4b6f44a9efd70f338fd6c56fd..d83359311bcabdb138409a1908fc5bf7791c7ade 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=15
+EXTRA_VERSION=16
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 917a2dd62bea80be9dd4429e19f906ca04466fee..613ca2b0994ef40e91bfaf64b90250867bb811e6 100644 (file)
@@ -1126,7 +1126,8 @@ static void compose_force_encryption(Compose *compose, PrefsAccount *account,
                }
        }
        if (privacy != NULL) {
-               compose->privacy_system = g_strdup(privacy);
+               if (compose->privacy_system == NULL)
+                       compose->privacy_system = g_strdup(privacy);
                compose_update_privacy_system_menu_item(compose, FALSE);
                compose_use_encryption(compose, TRUE);
        }
@@ -1146,7 +1147,8 @@ static void compose_force_signing(Compose *compose, PrefsAccount *account)
                }
        }
        if (privacy != NULL) {
-               compose->privacy_system = g_strdup(privacy);
+               if (compose->privacy_system == NULL)
+                       compose->privacy_system = g_strdup(privacy);
                compose_update_privacy_system_menu_item(compose, FALSE);
                compose_use_signing(compose, TRUE);
        }
@@ -3302,7 +3304,9 @@ static void compose_attach_parts(Compose *compose, MsgInfo *msginfo)
 
                        /* if we meet a pgp signature, we don't attach it, but
                         * we force signing. */
-                       if (strcmp(content_type, "application/pgp-signature")) {
+                       if (strcmp(content_type, "application/pgp-signature") &&
+                           strcmp(content_type, "application/pkcs7-signature") &&
+                           strcmp(content_type, "application/x-pkcs7-signature")) {
                                partname = procmime_mimeinfo_get_parameter(child, "filename");
                                if (partname == NULL)
                                        partname = procmime_mimeinfo_get_parameter(child, "name");