[git] GpgOL - branch, master, updated. gpgol-2.3.0-57-ga20d413

[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  a20d413e04778f529f885d0ebe7adf7d7077d436 (commit)
       via  08a048b168bf5cd92c7caf34553da2a7623bfdf0 (commit)
      from  3078e5a0cd8df98a0bd01882044c121936cf95d5 (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 a20d413e04778f529f885d0ebe7adf7d7077d436
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Sep 25 15:36:58 2018 +0200

    Fix potential deadlock in autosecure check
    
    * src/mail.cpp (autosecureCheck): Do not wait for
    the auto secure set to finish.
    
    --
    This fixes a race that could occur when the addressbook thread
    and a locator thread were working at the same time that
    could cause a deadlock in lockDelete.

diff --git a/src/mail.cpp b/src/mail.cpp
index 56adebf..d3b0f0d 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -3542,8 +3542,8 @@ Mail::autosecureCheck ()
    * to be triggered by the locator threads finishing we
    * need to actually set the draft info flags in
    * the ui thread. */
-  do_in_ui_thread (ret ? DO_AUTO_SECURE : DONT_AUTO_SECURE,
-                   this);
+  do_in_ui_thread_async (ret ? DO_AUTO_SECURE : DONT_AUTO_SECURE,
+                         this);
   TRETURN;
 }
 

commit 08a048b168bf5cd92c7caf34553da2a7623bfdf0
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Sep 25 15:36:43 2018 +0200

    Update de.po after auto msgfmt
    
    --

diff --git a/po/de.po b/po/de.po
index 2110878..fd22a0a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -182,8 +182,8 @@ msgstr ""
 msgid ""
 "The key is unusable for Outlook. Please check Kleopatra for more information."
 msgstr ""
-"Dieser Schlüssel ist für Outlook nicht benutzbar. Bitte prüfen Sie Kleopatra"
-" für mehr informationen."
+"Dieser Schlüssel ist für Outlook nicht benutzbar. Bitte prüfen Sie Kleopatra "
+"für mehr informationen."
 
 #. TRANSLATORS: Part of address book key configuration dialog.
 #: src/addin-options.cpp:94

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

Summary of changes:
 po/de.po     | 4 ++--
 src/mail.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


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