[git] GpgOL - branch, outlook14, updated. gpgol-1.1.3-40-g51a9225
by Andre Heinecke
cvs at cvs.gnupg.org
Mon Jul 15 15:54:45 CEST 2013
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, outlook14 has been updated
via 51a92254556d17e3d3e3fe452fc9f411d5dae7b4 (commit)
via b8d5974cb98a48fb4e236e3838b3db63f328302b (commit)
via e7c013fa8c81bad7b6f340512204d690ffab172b (commit)
from 6f19e712c4308fce5331ffb67c38b30a37446dcb (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 51a92254556d17e3d3e3fe452fc9f411d5dae7b4
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Jul 15 13:29:30 2013 +0000
Handle attachments in the reader window.
Previously the UI was only shown in the Preview window (Explorer)
* src/gpgoladdin.cpp (GetCustomUI): Add contextualmenu and context
menu for attachments.
diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 047858d..099015b 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -624,6 +624,19 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
L" </group>"
L" </tab>"
L" </tabs>"
+ L" <contextualTabs>"
+ L" <tabSet idMso=\"TabSetAttachments\">"
+ L" <tab idMso=\"TabAttachments\">"
+ L" <group label=\"%S\" id=\"gnupgLabel\">"
+ L" <button id=\"gpgol_contextual_decrypt\""
+ L" size=\"large\""
+ L" label=\"%S\""
+ L" getImage=\"btnDecryptLarge\""
+ L" onAction=\"attachmentDecryptCallback\" />"
+ L" </group>"
+ L" </tab>"
+ L" </tabSet>"
+ L" </contextualTabs>"
L" </ribbon>"
L"<contextMenus>"
L"<contextMenu idMso=\"ContextMenuReadOnlyMailText\">"
@@ -631,10 +644,17 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
L" label=\"%S\""
L" onAction=\"decryptSelection\"/>"
L" </contextMenu>"
+ L" <contextMenu idMso=\"ContextMenuAttachments\">"
+ L" <button id=\"gpgol_decrypt\""
+ L" label=\"%S\""
+ L" getImage=\"btnDecrypt\""
+ L" onAction=\"attachmentDecryptCallback\"/>"
+ L" </contextMenu>"
L"</contextMenus>"
- L"</customUI>", _("GpgOL"), _("General"),
- _("Start Certificate Manager"),
- _("Textbody"),
+ L"</customUI>",
+ _("GpgOL"), _("General"), _("Start Certificate Manager"),
+ _("Textbody"), _("Decrypt"),
+ _("GpgOL"), _("Save and decrypt"),
_("Decrypt"),
_("Decrypt"));
}
commit b8d5974cb98a48fb4e236e3838b3db63f328302b
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Jul 15 13:28:14 2013 +0000
Really fix gettext usage for the welcome message
* src/olflange.cpp (GpgolExt): Combine welcome message strings
with printf.
diff --git a/src/olflange.cpp b/src/olflange.cpp
index 7071ea5..10be051 100644
--- a/src/olflange.cpp
+++ b/src/olflange.cpp
@@ -521,28 +521,28 @@ GpgolExt::GpgolExt (void)
/* Note: If you want to change the announcment, you need to
increment the ANNOUNCE_NUMBER above. The number assures
that a user will see this message only once. */
- MessageBox
- (NULL,
- _("Welcome to GpgOL ") VERSION "\n"
- "\n"
- _("GpgOL adds integrated OpenPGP and S/MIME encryption "
- "and digital signing support to Outlook 2003 and 2007.\n"
- "\n"
- "Although we tested this software extensively, we can't "
- "give you any guarantee that it will work as expected. "
- "The programming interface we are using has not been properly "
- "documented by Microsoft and thus the functionality of GpgOL "
- "may cease to work with an update of your Windows system.\n"
- "\n"
- "WE STRONGLY ADVISE TO RUN ENCRYPTION TESTS BEFORE YOU START "
- "TO USE GPGOL ON ANY SENSITIVE DATA!\n"
- "\n"
- "There are some known problems, the most severe being "
- "that sending encrypted or signed mails using an Exchange "
- "based account does not work. Using GpgOL along with "
- "other Outlook plugins may in some cases not work."
- "\n"),
- "GpgOL", MB_ICONINFORMATION|MB_OK);
+ char buffer[4096];
+
+ snprintf (buffer, sizeof buffer, "%s\n\n%s%s",
+ _("Welcome to GpgOL "), VERSION,
+ _("GpgOL adds integrated OpenPGP and S/MIME encryption "
+ "and digital signing support to Outlook 2003 and 2007.\n"
+ "\n"
+ "Although we tested this software extensively, we can't "
+ "give you any guarantee that it will work as expected. "
+ "The programming interface we are using has not been properly "
+ "documented by Microsoft and thus the functionality of GpgOL "
+ "may cease to work with an update of your Windows system.\n"
+ "\n"
+ "WE STRONGLY ADVISE TO RUN ENCRYPTION TESTS BEFORE YOU START "
+ "TO USE GPGOL ON ANY SENSITIVE DATA!\n"
+ "\n"
+ "There are some known problems, the most severe being "
+ "that sending encrypted or signed mails using an Exchange "
+ "based account does not work. Using GpgOL along with "
+ "other Outlook plugins may in some cases not work."
+ "\n"));
+ MessageBox (NULL, buffer, "GpgOL", MB_ICONINFORMATION|MB_OK);
/* Show this warning only once. */
opt.announce_number = ANNOUNCE_NUMBER;
write_options ();
commit e7c013fa8c81bad7b6f340512204d690ffab172b
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Jul 15 13:25:03 2013 +0000
Also hack of garbage at the end of OpenPGP stream
Testing showed that this can also happen for OpenPGP
encrypted messages. Need to investigate what is wrong.
* src/ribbon-callbacks.cpp (encryptInspector): Cut of garbage
at the end of OpenPGP stream, too.
diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 7462f20..7712d06 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -316,17 +316,17 @@ encryptInspector (LPDISPATCH ctrl, int flags)
}
if (strlen (buffer) > 1)
{
+ char* lastlinebreak = strrchr (buffer, '\n');
+ if (lastlinebreak && (lastlinebreak - buffer) > 1)
+ {
+ /*XXX there is some strange data in the buffer
+ after the last linebreak investigate this and
+ fix it! */
+ lastlinebreak[1] = '\0';
+ }
/* Now replace the selection with the encrypted text */
if (protocol == PROTOCOL_SMIME)
{
- char* lastlinebreak = strrchr (buffer, '\n');
- if (lastlinebreak && (lastlinebreak - buffer) > 1)
- {
- /*XXX there is some strange data in the buffer
- after the last linebreak investigate this and
- fix it! */
- lastlinebreak[1] = '\0';
- }
unsigned int enclosedSize = strlen (buffer) + 34 + 31 + 1;
char enclosedData[enclosedSize];
snprintf (enclosedData, sizeof enclosedData,
-----------------------------------------------------------------------
Summary of changes:
src/gpgoladdin.cpp | 26 +++++++++++++++++++++++---
src/olflange.cpp | 44 ++++++++++++++++++++++----------------------
src/ribbon-callbacks.cpp | 16 ++++++++--------
3 files changed, 53 insertions(+), 33 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list