Merge branch 'master' into async-enc
authorAndre Heinecke <aheinecke@intevation.de>
Tue, 27 Feb 2018 06:50:01 +0000 (07:50 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Tue, 27 Feb 2018 06:50:01 +0000 (07:50 +0100)
1  2 
src/mail.cpp
src/mapihelp.cpp
src/oomhelp.h

diff --cc src/mail.cpp
Simple merge
@@@ -1140,10 -1182,22 +1182,26 @@@ change_message_class_ipm_note_smime_mul
          {
            newvalue = xstrdup ("IPM.Note.GpgOL.MultipartSigned");
          }
 +      else if (!strcmp (ct, "wks.confirmation.mail"))
 +        {
 +          newvalue = xstrdup ("IPM.Note.GpgOL.WKSConfirmation");
 +        }
+       else if (ct && !strcmp (ct, "application/ms-tnef"))
+         {
+           /* So no PGP Inline. Lets look at the attachment. */
+           char *attach_mime = get_first_attach_mime_tag (message);
+           if (!attach_mime)
+             {
+               xfree (ct);
+               xfree (proto);
+               return nullptr;
+             }
+           if (!strcmp (attach_mime, "multipart/signed"))
+             {
+               newvalue = xstrdup ("IPM.Note.GpgOL.MultipartSigned");
+               xfree (attach_mime);
+             }
+         }
        xfree (proto);
        xfree (ct);
      }
diff --cc src/oomhelp.h
Simple merge