[git] GpgOL - branch, master, updated. gpgol-2.3.1
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Oct 16 12:28:07 CEST 2018
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 3278db48c5422265ce937f03272bd026eeab8df9 (commit)
via 586af18a0d8e7cb4dc43cf6478a0969db0cc7022 (commit)
via ab957f55aeb693f2bf4a22a81f4d81b30c16c76b (commit)
via 3b8b39ad12b321c4e609916f60e5f05f741a269c (commit)
from b3c87431ea24946657956ae710440852da727582 (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 3278db48c5422265ce937f03272bd026eeab8df9
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Oct 16 12:25:20 2018 +0200
Auto update po files
--
diff --git a/po/de.po b/po/de.po
index fc1d88d..5e84c21 100644
--- a/po/de.po
+++ b/po/de.po
@@ -148,8 +148,8 @@ msgstr "Bevorzuge S/MIME gegenüber OpenPGP, wenn beide möglich sind."
msgid ""
"Search and import &X509 certificates in the configured directory services"
msgstr ""
-"&X509 Zertifikate in den konfigurierten Verzeichnisdiensten suchen und"
-" importieren."
+"&X509 Zertifikate in den konfigurierten Verzeichnisdiensten suchen und "
+"importieren."
#. TRANSLATORS: Part of the config dialog. Tooltip
#: src/addin-options.cpp:78
@@ -157,9 +157,8 @@ msgid ""
"Searches for X509 certificates automatically and imports them. This option "
"searches in all configured services."
msgstr ""
-"Sucht automatisch nach X509 Zertifikaten und importiert diese. Diese Option"
-" sucht "
-"in alle konfigurierten Diensten."
+"Sucht automatisch nach X509 Zertifikaten und importiert diese. Diese Option "
+"sucht in alle konfigurierten Diensten."
#. TRANSLATORS: Part of the config dialog. Warning about privacy leak.
#: src/addin-options.cpp:80
@@ -167,8 +166,8 @@ msgid ""
"<b>Warning:</b> The configured services will receive information about whom "
"you send Emails!"
msgstr ""
-"<b>Warnung:</b> Die konfigurierten Dienste erhalten Informationen darüber wem"
-" Sie Mails schreiben!"
+"<b>Warnung:</b> Die konfigurierten Dienste erhalten Informationen darüber "
+"wem Sie Mails schreiben!"
#. TRANSLATORS: Part of address book key configuration dialog.
#. The contacts name follows.
commit 586af18a0d8e7cb4dc43cf6478a0969db0cc7022
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Oct 16 12:24:35 2018 +0200
Update NEWS for todays release
--
diff --git a/NEWS b/NEWS
index f5f6bf2..550d942 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,17 @@
-Noteworthy changes for version 2.3.1 (unreleased)
+Noteworthy changes for version 2.3.1 (2018-10-16)
=================================================
+ * Fixed attachement handling for office and pdf attachments.
+
+ * Improved signature info display.
+
+ * Added address book integration for OpenPGP.
+
+ * Added auto import capabilities for S/MIME.
+
+ * Added generic prefer S/MIME mode.
+
+ * Various bugfixes and regression fixes.
Noteworthy changes for version 2.3.0 (2018-08-31)
=================================================
commit ab957f55aeb693f2bf4a22a81f4d81b30c16c76b
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Oct 16 12:22:47 2018 +0200
Do not try to import empty key data from addrbook
* src/keycache.cpp (importFromAddrBook): Check if data
is empty.
diff --git a/src/keycache.cpp b/src/keycache.cpp
index 69171c6..e1bb17f 100644
--- a/src/keycache.cpp
+++ b/src/keycache.cpp
@@ -735,22 +735,29 @@ public:
TRACEPOINT;
TRETURN;
}
- gpgol_lock (&import_lock);
- if (m_import_jobs.find (mbox) != m_import_jobs.end ())
- {
- log_debug ("%s:%s import for \"%s\" already in progress.",
- SRCNAME, __func__, anonstr (mbox.c_str ()));
- gpgol_unlock (&import_lock);
- }
- m_import_jobs.insert (mbox);
- gpgol_unlock (&import_lock);
- import_arg_t * args = new import_arg_t;
- args->first = std::unique_ptr<LocateArgs> (new LocateArgs (mbox, mail));
- args->second = std::string (data);
- CloseHandle (CreateThread (NULL, 0, do_import,
- (LPVOID) args, 0,
- NULL));
+ std::string sdata (data);
+ trim (sdata);
+ if (sdata.empty())
+ {
+ TRETURN;
+ }
+ gpgol_lock (&import_lock);
+ if (m_import_jobs.find (mbox) != m_import_jobs.end ())
+ {
+ log_debug ("%s:%s import for \"%s\" already in progress.",
+ SRCNAME, __func__, anonstr (mbox.c_str ()));
+ gpgol_unlock (&import_lock);
+ }
+ m_import_jobs.insert (mbox);
+ gpgol_unlock (&import_lock);
+
+ import_arg_t * args = new import_arg_t;
+ args->first = std::unique_ptr<LocateArgs> (new LocateArgs (mbox, mail));
+ args->second = sdata;
+ CloseHandle (CreateThread (NULL, 0, do_import,
+ (LPVOID) args, 0,
+ NULL));
TRETURN;
}
commit 3b8b39ad12b321c4e609916f60e5f05f741a269c
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Oct 16 12:21:42 2018 +0200
Make address book lookup more robust
* src/addressbook.cpp (Addressbook::update_key_o): Clear checked
entries after update.
(Addressbook::check_o): Only mark resolved contacts as checked.
:xa
diff --git a/src/addressbook.cpp b/src/addressbook.cpp
index 6c0f4d4..7a92961 100644
--- a/src/addressbook.cpp
+++ b/src/addressbook.cpp
@@ -38,6 +38,8 @@ typedef struct
shared_disp_t contact;
} keyadder_args_t;
+static std::set <std::string> s_checked_entries;
+
static DWORD WINAPI
open_keyadder (LPVOID arg)
{
@@ -150,6 +152,8 @@ Addressbook::update_key_o (void *callback_args)
SRCNAME, __func__);
gpgol_release (pgp_key);
+
+ s_checked_entries.clear ();
TRETURN;
}
@@ -215,7 +219,6 @@ Addressbook::edit_key_o (LPDISPATCH contact)
TRETURN;
}
-static std::set <std::string> s_checked_entries;
/* For each new recipient check the address book to look for a potentially
configured key for this recipient and import / register
it into the keycache.
@@ -252,7 +255,6 @@ Addressbook::check_o (Mail *mail)
{
continue;
}
- s_checked_entries.insert (pair.first);
if (!pair.second)
{
@@ -268,6 +270,7 @@ Addressbook::check_o (Mail *mail)
anonstr (pair.first.c_str()));
continue;
}
+ s_checked_entries.insert (pair.first);
LPDISPATCH user_props = get_oom_object (contact.get (), "UserProperties");
if (!user_props)
-----------------------------------------------------------------------
Summary of changes:
NEWS | 13 ++++++++++++-
po/de.po | 13 ++++++-------
src/addressbook.cpp | 7 +++++--
src/keycache.cpp | 37 ++++++++++++++++++++++---------------
4 files changed, 45 insertions(+), 25 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list