[git] GpgOL - branch, master, updated. gpgol-2.0.0-2-g403834e

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  403834e86f549b33bd9acddfdfdccc9d7af9817f (commit)
       via  fdb6ba59d00ba0730f75870fd197d8d562bb88b8 (commit)
      from  4d3ab575495c2ee39b2bfcf4be89120e42af76b4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 403834e86f549b33bd9acddfdfdccc9d7af9817f
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Sep 14 16:41:35 2017 +0200

    Fix regression for multipart/signed mails
    
    * src/mapihelp.cpp (mapi_change_message_class): Call
    change_message_class_ipm_note_smime_multipartsigned even
    if S/MIME is disabled.
    
    --
    This function actually checks if a message with the class
    IPM.Note.SMIME.MultipartSigned is actually a PGP / MIME mail
    so it needs to be called even if S/MIME is disabled.
    
    This fixes multipart signed mail handling.

diff --git a/src/mapihelp.cpp b/src/mapihelp.cpp
index 02a6556..1c3a5f6 100644
--- a/src/mapihelp.cpp
+++ b/src/mapihelp.cpp
@@ -1296,8 +1296,7 @@ mapi_change_message_class (LPMESSAGE message, int sync_override)
           newvalue = (char*)xmalloc (strlen (s) + 1);
           strcpy (stpcpy (newvalue, "IPM.Note.GpgOL"), s+14);
         }
-      else if (opt.enable_smime &&
-               !strcmp (s, "IPM.Note.SMIME.MultipartSigned"))
+      else if (!strcmp (s, "IPM.Note.SMIME.MultipartSigned"))
         {
           /* This is an S/MIME message class but smime support is not
              enabled.  We need to check whether this is actually a

commit fdb6ba59d00ba0730f75870fd197d8d562bb88b8
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Sep 12 13:40:36 2017 +0200

    Post release updates
    
    --

diff --git a/NEWS b/NEWS
index 8149d69..2ec539f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes for version 2.0.1 (unreleased)
+=================================================
+
+
 Noteworthy changes for version 2.0.0 (2017-09-12)
 =================================================
 
diff --git a/configure.ac b/configure.ac
index 418fb62..b186624 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ min_automake_version="1.14"
 # (git tag -s gpgol-k.n.m) and run "./autogen.sh --force".  Please
 # bump the version number immediately *after* the release and do
 # another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [2.0.0])
+m4_define([mym4_version], [2.0.1])
 
 # Below is m4 magic to extract and compute the git revision number,
 # the decimalized short revision number, a beta version string and a

-----------------------------------------------------------------------

Summary of changes:
 NEWS             | 4 ++++
 configure.ac     | 2 +-
 src/mapihelp.cpp | 3 +--
 3 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org