[git] GpgOL - branch, master, updated. gpgol-1.4.0-179-g93f6204

[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  93f6204e256b1a773c1912b33e95f214a1a962d2 (commit)
       via  f240d185cae7bc62775cbf30264aa90708e6f19d (commit)
      from  c7c293a1c69de961abf388664b2897b509d9a934 (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 93f6204e256b1a773c1912b33e95f214a1a962d2
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Nov 17 15:48:59 2016 +0100

    Improve wording in debug output for failed crypto
    
    --

diff --git a/src/mailitem-events.cpp b/src/mailitem-events.cpp
index d5e7ef4..4091f06 100644
--- a/src/mailitem-events.cpp
+++ b/src/mailitem-events.cpp
@@ -356,7 +356,7 @@ EVENT_SINK_INVOKE(MailItemEvents)
             }
           else
             {
-              log_debug ("%s:%s: Message %p cancelling send crypto failed.",
+              log_debug ("%s:%s: Message %p cancelling send - crypto failed.",
                          SRCNAME, __func__, m_object);
               *(parms->rgvarg[0].pboolVal) = VARIANT_TRUE;
             }

commit f240d185cae7bc62775cbf30264aa90708e6f19d
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Nov 17 15:47:31 2016 +0100

    Don't show MessageBox when encryption failed
    
    * src/message.cpp (sign_encrypt): Disable messagebox
    
    --
    At least kleopatra returns -1 if encryption is cancelled by
    the user. In that case we really really don't want to have
    that messagebox.

diff --git a/src/message.cpp b/src/message.cpp
index cd99913..aca415e 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -1110,10 +1110,9 @@ sign_encrypt (LPMESSAGE message, protocol_t protocol, HWND hwnd, int signflag,
                               "is not possible."),
                       "GpgOL", MB_ICONERROR|MB_OK);
         }
-      else if (err && opt.enable_debug)
+      else if (err && err != -1)
         {
           char buf[200];
-          
           snprintf (buf, sizeof buf,
                     _("Encryption failed (%s)"), gpg_strerror (err));
           MessageBox (hwnd, buf, "GpgOL", MB_ICONERROR|MB_OK);

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

Summary of changes:
 src/mailitem-events.cpp | 2 +-
 src/message.cpp         | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)


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