[git] GpgOL - branch, master, updated. gpgol-2.2.0-128-ge4f0d5c
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Jul 24 11:08:55 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 e4f0d5ca1ae0c27b4e52839c8ec6fd9d5cdda8e8 (commit)
via 2353e5fd63e3877067dd7d638513b17c57a70802 (commit)
via 67f3f9627a1cb058b762efa03653d3ada3056338 (commit)
via 4074a157c304a0698a71500c0508db9b74d78fef (commit)
from 87f6328dea01614ec6e9282f05c8f3eb35470d12 (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 e4f0d5ca1ae0c27b4e52839c8ec6fd9d5cdda8e8
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jul 24 11:07:45 2018 +0200
Minor cleanups
* src/cryptcontroller.cpp, src/cryptcontroller.h: m_recipents is
now a vector.
diff --git a/src/cryptcontroller.cpp b/src/cryptcontroller.cpp
index 826dde4..f6f1542 100644
--- a/src/cryptcontroller.cpp
+++ b/src/cryptcontroller.cpp
@@ -71,7 +71,7 @@ CryptController::CryptController (Mail *mail, bool encrypt, bool sign,
memdbg_ctor ("CryptController");
log_debug ("%s:%s: CryptController ctor for %p encrypt %i sign %i inline %i.",
SRCNAME, __func__, mail, encrypt, sign, mail->getDoPGPInline ());
- m_recipient_addrs = vector_to_cArray (mail->getCachedRecipients ());
+ m_recipient_addrs = mail->getCachedRecipients ();
}
CryptController::~CryptController()
@@ -79,7 +79,6 @@ CryptController::~CryptController()
memdbg_dtor ("CryptController");
log_debug ("%s:%s:%p",
SRCNAME, __func__, m_mail);
- release_cArray (m_recipient_addrs);
}
int
@@ -222,6 +221,7 @@ CryptController::lookup_fingerprints (const std::string &sigFpr,
if (err) {
log_error ("%s:%s: failed to start recipient keylisting",
SRCNAME, __func__);
+ release_cArray (cRecps);
return -1;
}
@@ -322,7 +322,7 @@ CryptController::resolve_keys_cached()
if (m_encrypt)
{
const auto cached_sender = m_mail->getSender ();
- auto recps = cArray_to_vector ((const char**) m_recipient_addrs);
+ auto recps = m_recipient_addrs;
recps.push_back (cached_sender);
m_recipients.clear();
@@ -479,9 +479,9 @@ CryptController::resolve_keys ()
{
args.push_back (std::string ("--encrypt"));
// Get the recipients that are cached from OOM
- for (size_t i = 0; m_recipient_addrs && m_recipient_addrs[i]; i++)
+ for (const auto &addr: m_recipient_addrs)
{
- args.push_back (GpgME::UserID::addrSpecFromString (m_recipient_addrs[i]));
+ args.push_back (GpgME::UserID::addrSpecFromString (addr.c_str()));
}
}
diff --git a/src/cryptcontroller.h b/src/cryptcontroller.h
index 4ba57d9..8a3ffe5 100644
--- a/src/cryptcontroller.h
+++ b/src/cryptcontroller.h
@@ -94,7 +94,7 @@ private:
GpgME::Key m_signer_key;
std::vector<GpgME::Key> m_recipients;
std::unique_ptr<Overlay> m_overlay;
- char **m_recipient_addrs;
+ std::vector<std::string> m_recipient_addrs;
};
#endif
commit 2353e5fd63e3877067dd7d638513b17c57a70802
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jul 24 11:06:56 2018 +0200
Fix memory leak when opening options
* src/addin-options.cpp (open_gpgolgui): Release cArray.
diff --git a/src/addin-options.cpp b/src/addin-options.cpp
index 6d3da45..f81bed8 100644
--- a/src/addin-options.cpp
+++ b/src/addin-options.cpp
@@ -119,6 +119,7 @@ open_gpgolgui (LPVOID arg)
(GpgME::Context::SpawnFlags) (
GpgME::Context::SpawnAllowSetFg |
GpgME::Context::SpawnShowWindow));
+ release_cArray (cargs);
if (err)
{
log_error ("%s:%s: Err code: %i asString: %s",
commit 67f3f9627a1cb058b762efa03653d3ada3056338
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jul 24 10:25:17 2018 +0200
Auto update german po file formatting
* po/de.po: Update.
diff --git a/po/de.po b/po/de.po
index e456a05..c392396 100644
--- a/po/de.po
+++ b/po/de.po
@@ -94,10 +94,9 @@ msgid ""
"This changes the trust model to \"tofu+pgp\" which tracks the history of key "
"usage. Automated trust can <b>never</b> exceed level 2."
msgstr ""
-"Dies ändert das Vertrauensmodell auf \"tofu+pgp\", welches die"
-" Kommunikationshistorie "
-"des Schlüssels berücksichtigt. Automatisiertes vertrauen kann <b>niemals</b>"
-" level 2 übersteigen."
+"Dies ändert das Vertrauensmodell auf \"tofu+pgp\", welches die "
+"Kommunikationshistorie des Schlüssels berücksichtigt. Automatisiertes "
+"vertrauen kann <b>niemals</b> level 2 übersteigen."
#: src/addin-options.cpp:62
msgid "experimental"
@@ -123,8 +122,8 @@ msgstr "Wählt die Signieren Option für alle neuen Mails. "
msgid ""
"Toggles sign, encrypt options if the original mail was signed or encrypted."
msgstr ""
-"Wählt signieren, verschlüsseln je nachdem ob die original Mail signiert oder"
-" verschlüsselt war."
+"Wählt signieren, verschlüsseln je nachdem ob die original Mail signiert oder "
+"verschlüsselt war."
#: src/addin-options.cpp:67
msgid ""
@@ -132,11 +131,10 @@ msgid ""
"encoding, the deprecated PGP/Inline is used.\n"
"This can be required for compatibility but should generally not be used."
msgstr ""
-"Anstelle des PGP/MIME Formats, welches Anhänge und encoding richtig"
-" behandelt, "
-"das veraltete PGP/Inline verwenden.\n"
-"Dies kann für kompatibilität manchmal nötig sein, sollte aber generell nicht"
-" verwendet werden."
+"Anstelle des PGP/MIME Formats, welches Anhänge und encoding richtig "
+"behandelt, das veraltete PGP/Inline verwenden.\n"
+"Dies kann für kompatibilität manchmal nötig sein, sollte aber generell nicht "
+"verwendet werden."
#: src/common.cpp:768
msgid "GpgOL Error"
commit 4074a157c304a0698a71500c0508db9b74d78fef
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jul 24 10:24:34 2018 +0200
Fix return value of is_crypt_pressed
* src/ribbon-callbacks.cpp (get_crypt_pressed): Fix return
value.
diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index d2310e0..fa10c8c 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -327,7 +327,7 @@ HRESULT get_crypt_pressed (LPDISPATCH ctrl, int flags, VARIANT *result,
value = (get_gpgol_draft_info_flags (message) & flags) == flags;
- *(result->pboolVal) = value ? var_true: var_false;
+ result->pboolVal = value ? &var_true: &var_false;
done:
gpgol_release (context);
-----------------------------------------------------------------------
Summary of changes:
po/de.po | 20 +++++++++-----------
src/addin-options.cpp | 1 +
src/cryptcontroller.cpp | 10 +++++-----
src/cryptcontroller.h | 2 +-
src/ribbon-callbacks.cpp | 2 +-
5 files changed, 17 insertions(+), 18 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list