[git] GpgOL - branch, master, updated. gpgol-2.3.1-40-gc921d50

[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  c921d50a3c6659c8b1ba4bc47762035be395f104 (commit)
      from  d27f609e7f606b6f85c483f15091fa2a5cb204ba (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 c921d50a3c6659c8b1ba4bc47762035be395f104
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Nov 9 18:36:12 2018 +0100

    Disable async crypt for mails without subject
    
    * src/mail.cpp (Mail::check_inline_response): Disable also
    for empty subject.
    --
    For mails with an empty subject Outlook asks if the mail
    should be sent anyway. If we do async crypto it also asks
    on our triggered send event. In that case the overlay
    blocks it. So better just disable async in that case so
    that there are no two questions.
    
    GnuPG-Bug-Id: T4150

diff --git a/src/mail.cpp b/src/mail.cpp
index e44dcde..dbb7731 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -3334,6 +3334,19 @@ Mail::check_inline_response ()
 
   m_async_crypt_disabled = false;
 
+  const auto subject = getSubject_o ();
+
+  /* Check for an empty subject. Otherwise the question for it
+     might be hidden behind our overlay. */
+  if (subject.empty())
+    {
+      log_debug ("%s:%s: Detected empty subject. "
+                 "Disabling async crypt due to T4150.",
+                 SRCNAME, __func__);
+      m_async_crypt_disabled = true;
+      TRETURN m_async_crypt_disabled;
+    }
+
   LPDISPATCH attachments = get_oom_object (m_mailitem, "Attachments");
   if (attachments)
     {
@@ -3417,7 +3430,6 @@ Mail::check_inline_response ()
   char * inlineSubject = get_oom_string (inlineResponse, "Subject");
   gpgol_release (inlineResponse);
 
-  const auto subject = getSubject_o ();
   if (inlineResponse && !subject.empty() && !strcmp (subject.c_str (), inlineSubject))
     {
       log_debug ("%s:%s: Detected inline response for '%p'",

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

Summary of changes:
 src/mail.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)


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