[git] GpgOL - branch, master, updated. gpgol-2.2.0-21-g27e7dfb

[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  27e7dfb1280f314286348a661e057eef5c8ab440 (commit)
       via  0554e238292253dcb2d5c0dd08e723b5e1ad4ac3 (commit)
      from  a41e34fde420cff26e2c09316259cedcbde649f2 (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 27e7dfb1280f314286348a661e057eef5c8ab440
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jun 22 17:10:32 2018 +0200

    Enable async crypto again (for now)
    
    * src/mail.cpp (DO_ASYNC_CRYPTO): Define.
    
    --
    This works soo much better. But I still have not figured out
    why it crashes reliably for some users. :-/

diff --git a/src/mail.cpp b/src/mail.cpp
index 11266e5..0e94871 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -70,6 +70,8 @@ static Mail *s_last_mail;
 
 #define COPYBUFSIZE (8 * 1024)
 
+#define DO_ASYNC_CRYPTO
+
 Mail::Mail (LPDISPATCH mailitem) :
     m_mailitem(mailitem),
     m_processed(false),

commit 0554e238292253dcb2d5c0dd08e723b5e1ad4ac3
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jun 22 17:09:27 2018 +0200

    Note mbox in WKS message
    
    * src/wks-helper.cpp (WKSHelper::notify): Note for which
    mbox the message applies.
    
    --
    With multiple accounts this can otherwise be confusing. We
    also avoid the word "domain" which is too technical for most.

diff --git a/src/wks-helper.cpp b/src/wks-helper.cpp
index 9799576..bf03425 100644
--- a/src/wks-helper.cpp
+++ b/src/wks-helper.cpp
@@ -400,12 +400,15 @@ WKSHelper::notify (const char *cBox) const
 
   if (state == NeedsPublish)
     {
+      char *buf;
+      gpgrt_asprintf (&buf, _("A Pubkey directory is available for the address:\n\n"
+                              "\t%s\n\n"
+                              "Register your Pubkey in that directory to make\n"
+                              "it easy for others to send you encrypted mail.\n\n"
+                              "It's secure and free!\n\n"
+                              "Register automatically?"), mbox);
       if (gpgol_message_box (get_active_hwnd (),
-                             _("A Pubkey directory is available for your domain.\n\n"
-                               "Register your Pubkey in that directory to make\n"
-                               "it easy for others to send you encrypted mail.\n\n"
-                               "It's secure and free!\n\n"
-                               "Register automatically?"),
+                             buf,
                              _("GpgOL: Pubkey directory available!"), MB_YESNO) == IDYES)
         {
           start_publish (mbox);
@@ -414,6 +417,7 @@ WKSHelper::notify (const char *cBox) const
         {
           update_state (mbox, PublishDenied);
         }
+      xfree (buf);
       return;
     }
   if (state == ConfirmationSeen)

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

Summary of changes:
 src/mail.cpp       |  2 ++
 src/wks-helper.cpp | 14 +++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)


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