[git] GpgOL - branch, master, updated. gpgol-1.4.0-3-g643575f

[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  643575f38f545456afc456e1045b914d3d06bbb8 (commit)
      from  a10532b6cf3527391bdb14470fbebf0205b9253a (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 643575f38f545456afc456e1045b914d3d06bbb8
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Jun 29 17:17:48 2016 +0200

    Ignore sent S/MIME Mails if S/MIME is disabled
    
    * src/mapihelp.cpp (mapi_change_message_class): Add check for
    S/MIME disabled.
    
    --
    Outlook sets sent Mails to IPM.Note.SMIME (without suffix). When
    S/MIME is disabled we need to ignore these messages. Our own
    messages that are marked as S/MIME messages on send even if they
    are PGP Messages have the override message class set so they are not
    affected by this.
    
    GnuPG-Bug-Id: 2319

diff --git a/src/mapihelp.cpp b/src/mapihelp.cpp
index 7d11364..e916209 100644
--- a/src/mapihelp.cpp
+++ b/src/mapihelp.cpp
@@ -1226,7 +1226,7 @@ mapi_change_message_class (LPMESSAGE message, int sync_override)
         {
           newvalue = change_message_class_ipm_note (message);
         }
-      else if (!strcmp (s, "IPM.Note.SMIME"))
+      else if (opt.enable_smime && !strcmp (s, "IPM.Note.SMIME"))
         {
           newvalue = change_message_class_ipm_note_smime (message);
         }

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

Summary of changes:
 src/mapihelp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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