[git] GpgOL - branch, master, updated. gpgol-1.2.0-79-g6f2f9a3

[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  6f2f9a3042f856ec54ec89808cb204f0b9dcd058 (commit)
      from  a3fba91652d00c1f38bdf30e2028ddc4ac7fe9ab (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 6f2f9a3042f856ec54ec89808cb204f0b9dcd058
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Oct 30 16:55:54 2015 +0100

    Fix regression introduced by 383cb091
    
    * src/message.cpp (message_decrypt): Fix parenthesis.
    
    --
    The fix for -Wparentheses used the wrong paranthesis and
    this broke detection of our "own" pgp/mime mails.
    
    Should have been more attentive in my first semester
    "basics of programming" course :-)

diff --git a/src/message.cpp b/src/message.cpp
index 7ddd896..1d9fb4a 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -1008,11 +1008,11 @@ message_decrypt (LPMESSAGE message, msgtype_t msgtype, int force, HWND hwnd)
             }
 
 
-          if ((part1_idx == -1 || part2_idx == -1)
+          if (part1_idx == -1 || (part2_idx == -1
               && !table[0].end_of_table && table[1].end_of_table
               && table[0].attach_type == ATTACHTYPE_MOSS
               && table[0].filename 
-              && !strcmp (table[0].filename, MIMEATTACHFILENAME))
+              && !strcmp (table[0].filename, MIMEATTACHFILENAME)))
             {
               /* This is likely a PGP/MIME created by us.  Due to the
                  way we created that message, the MAPI derived content

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

Summary of changes:
 src/message.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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