[git] GpgOL - branch, master, updated. gpgol-2.2.0-30-gb800b5c

[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  b800b5ca1ef64de3d18864781956cec56d1f4136 (commit)
       via  57a81b6b6f63501be979b3ee9dbeef800f254e48 (commit)
      from  690c8fe80a15991be6a9c636967b12ac47a7a110 (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 b800b5ca1ef64de3d18864781956cec56d1f4136
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jun 26 14:46:49 2018 +0200

    Enable auto-key-retrieve if autoresolve is set
    
    * src/parsecontroller.cpp (ParseController::parse): Enable
    auto-key-retrieve if autoresolve is set to true.
    
    --
    With autoresolve we do network lookups already so it makes
    sense to reuse the option here.

diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index 5adada8..d61fc69 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -305,6 +305,13 @@ ParseController::parse()
       xfree (buf);
       return;
     }
+
+  /* Maybe a different option for this ? */
+  if (opt.autoresolve)
+    {
+      ctx->setFlag("auto-key-retrieve", "1");
+    }
+
   ctx->setArmor(true);
 
   if (!m_sender.empty())

commit 57a81b6b6f63501be979b3ee9dbeef800f254e48
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jun 26 14:43:10 2018 +0200

    Fix bring to foreground logic
    
    * src/mail.cpp (do_crypt): Bring to foreground with delay.
    * src/windowmessages.cpp (gpgol_window_proc): Don't sleep in the
    UI thread.
    
    --
    Sleeping in the UI thread to wait for the UI thread to do something
    (close a window) was stupid.
    
    GnuPG-Bug-Id: T3771

diff --git a/src/mail.cpp b/src/mail.cpp
index 2418544..ead39ec 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -927,7 +927,7 @@ do_crypt (LPVOID arg)
 
      See GnuPG-Bug-Id: T3732
      */
-  do_in_ui_thread_async (BRING_TO_FRONT, nullptr);
+  do_in_ui_thread_async (BRING_TO_FRONT, nullptr, 250);
   log_debug ("%s:%s: crypto thread for %p finished",
              SRCNAME, __func__, arg);
   return 0;
diff --git a/src/windowmessages.cpp b/src/windowmessages.cpp
index 83d0cfd..c371886 100644
--- a/src/windowmessages.cpp
+++ b/src/windowmessages.cpp
@@ -155,9 +155,6 @@ gpgol_window_proc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             }
           case (BRING_TO_FRONT):
             {
-              // We want to avoid a race where the mail window
-              // was still the active window.
-              Sleep (250);
               HWND wnd = get_active_hwnd ();
               if (wnd)
                 {

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

Summary of changes:
 src/mail.cpp            | 2 +-
 src/parsecontroller.cpp | 7 +++++++
 src/windowmessages.cpp  | 3 ---
 3 files changed, 8 insertions(+), 4 deletions(-)


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