[git] GpgOL - branch, master, updated. gpgol-2.0.6-132-gd13de35

[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  d13de350caa214e97ac18066ba9cdb8caef64ed8 (commit)
       via  17b513433ba0e0d0bda5f3b24d310a923c993759 (commit)
       via  d3a220f060cd670e707a511fd577309e418521eb (commit)
       via  49d53c7dfdc188427635a0515ef01e17f753b2a9 (commit)
      from  34f6bb73882ee5a9c996db506fb4f730aa57e658 (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 d13de350caa214e97ac18066ba9cdb8caef64ed8
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Apr 11 16:14:44 2018 +0200

    Show warning if attachment of crypt mail removed
    
    * src/mailitem-events.cpp (EVENT_SINK_INVOKE): Handle
    AttachmentRemove event and show warning if an attachment
    is removed from a crypto mail.
    
    --
    GnuPG-Bug-Id: T3886

diff --git a/src/mailitem-events.cpp b/src/mailitem-events.cpp
index 7dec4c4..e73e0ee 100644
--- a/src/mailitem-events.cpp
+++ b/src/mailitem-events.cpp
@@ -103,6 +103,7 @@ MailItemEvents::~MailItemEvents()
 }
 
 static bool propchangeWarnShown = false;
+static bool attachRemoveWarnShown = false;
 
 static DWORD WINAPI
 do_delayed_locate (LPVOID arg)
@@ -787,6 +788,21 @@ EVENT_SINK_INVOKE(MailItemEvents)
           gpgol_release (msg);
           break;
         }
+      case AttachmentRemove:
+        {
+          log_oom_extra ("%s:%s: AttachmentRemove: %p",
+                         SRCNAME, __func__, m_mail);
+          if (!m_mail->is_crypto_mail () || attachRemoveWarnShown)
+            {
+              return S_OK;
+            }
+          gpgol_message_box (get_active_hwnd (),
+                             _("Attachments are part of the crypto message.\nThey "
+                               "can't be permanently removed and will be shown again the next "
+                               "time this message is opened."),
+                             _("Sorry, that's not possible, yet"), MB_OK);
+          attachRemoveWarnShown = true;
+        }
 
       default:
         log_oom_extra ("%s:%s: Message:%p Unhandled Event: %lx \n",

commit 17b513433ba0e0d0bda5f3b24d310a923c993759
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Apr 11 16:14:16 2018 +0200

    Ignore received time propchange
    
    * src/mailitem-events.cpp (prop_blacklist): Add
    ReceivedTime to blacklist.

diff --git a/src/mailitem-events.cpp b/src/mailitem-events.cpp
index f63665c..7dec4c4 100644
--- a/src/mailitem-events.cpp
+++ b/src/mailitem-events.cpp
@@ -44,6 +44,7 @@ const wchar_t *prop_blacklist[] = {
   L"UnRead",
   L"OutlookVersion",
   L"OutlookInternalVersion",
+  L"ReceivedTime",
   NULL };
 
 typedef enum

commit d3a220f060cd670e707a511fd577309e418521eb
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Apr 11 16:12:49 2018 +0200

    Fix early deletion of temporary attachments
    
    * src/mail.cpp (add_attachments): Close handle before
    deletion.
    
    --
    This fixes the problem that as long as Outlook is open
    the temporary files stick around and are not removed.
    Which in turn leads to numbers added to the attachments.
    
    GnuPG-Bug-Id: T3886

diff --git a/src/mail.cpp b/src/mail.cpp
index a408800..2abff2a 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -632,6 +632,7 @@ add_attachments(LPDISPATCH mail,
                      SRCNAME, __func__, att->get_display_name().c_str());
           err = 1;
         }
+      CloseHandle (hFile);
       if (!DeleteFileW (wchar_file))
         {
           log_error ("%s:%s: Failed to delete tmp attachment for: %s",

commit 49d53c7dfdc188427635a0515ef01e17f753b2a9
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Apr 11 16:11:31 2018 +0200

    Fix spelling in german propchange warning
    
    * po/de.po: Fix german propchange warning.
    
    --
    GnuPG-Bug-Id: T3884

diff --git a/po/de.po b/po/de.po
index 9d29005..f8b9ebb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -759,15 +759,15 @@ msgid ""
 "\n"
 "For example by right clicking but not selecting the message.\n"
 msgstr ""
-"GpgOL hat eine Änderung an der \"%s\" Eigenschaft verhindern.\n"
-"Änderungen an Eigenschaften werden noch nicht für Krypto Nachrichten "
+"GpgOL hat eine Änderung an der \"%s\" Eigenschaft verhindert.\n"
+"Änderungen an Eigenschaften werden noch nicht für Krypto-Nachrichten "
 "unterstützt.\n"
 "\n"
-"Um dieses Problem zu umgehen ändern Sie bitte die Eigenschaft zu einem "
-"Zeitpunkt wenn die Nachricht in keinem Fenster geöffnet ist und nicht in der "
+"Um dieses Problem zu umgehen, ändern Sie bitte die Eigenschaft wenn "
+"die Nachricht in keinem Fenster geöffnet ist und nicht in der "
 "Nachrichtenliste ausgewählt ist.\n"
 "\n"
-"Beispielsweise durch einen Rechtsklick auf die Nachricht wenn diese nicht "
+"Beispielsweise durch einen Rechtsklick auf die Nachricht, wenn diese nicht "
 "ausgewählt ist.\n"
 
 #: src/main.c:466

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

Summary of changes:
 po/de.po                | 10 +++++-----
 src/mail.cpp            |  1 +
 src/mailitem-events.cpp | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)


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