[git] GpgOL - branch, async-enc, updated. gpgol-2.0.6-17-g77208c2

[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, async-enc has been updated
       via  77208c29861a06b70a8f4464e3255f0818ba96b0 (commit)
       via  153616194d2562c1aabda8b61d787d8f6cf5b3b6 (commit)
       via  cd8633c93a4f7f6f6b9668fcc9669beb9e47188b (commit)
       via  833c56e4f24674588b72fb9f3a958eba87ccdb62 (commit)
       via  c2572084cdb13a154e0e2bbc156155865b08c83e (commit)
       via  fb43d7dc2a4e7c6f822050eec0489248fe162af7 (commit)
      from  88118b5baaff9c7289d27ca55b084e5c1860f8aa (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 77208c29861a06b70a8f4464e3255f0818ba96b0
Merge: 88118b5 1536161
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Feb 12 15:34:12 2018 +0100

    Merge branch 'master' into async-enc

diff --cc src/windowmessages.h
index a278675,014c7d9..fba7088
--- a/src/windowmessages.h
+++ b/src/windowmessages.h
@@@ -36,14 -40,13 +40,14 @@@
    */
  typedef enum _gpgol_wmsg_type
  {
-   UNKNOWN = 0,
-   INVALIDATE_UI = 1, /* The UI should be invalidated. */
-   PARSING_DONE = 2, /* A mail was parsed. Data should be a pointer
+   UNKNOWN = 1100, /* A large offset to avoid conflicts */
+   INVALIDATE_UI, /* The UI should be invalidated. */
+   PARSING_DONE, /* A mail was parsed. Data should be a pointer
                        to the mail object. */
-   RECIPIENT_ADDED = 3, /* A recipient was added. Data should be ptr
-                           to mail */
-   CLOSE = 4, /* Close the message in the next event loop. */
-   CRYPTO_DONE = 5, /* Sign / Encrypt done. */
+   RECIPIENT_ADDED, /* A recipient was added. Data should be ptr
 -                          to mail */
 -  CLOSE, /* Send the message in the next event loop. */
++                      to mail */
++  CLOSE, /* Close the message in the next event loop. */
++  CRYPTO_DONE, /* Sign / Encrypt done. */
  } gpgol_wmsg_type;
  
  typedef struct

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

Summary of changes:
 src/mail.cpp           | 21 ++++++++++++++++++++-
 src/windowmessages.cpp |  9 +++++----
 src/windowmessages.h   | 21 ++++++++++++++-------
 3 files changed, 39 insertions(+), 12 deletions(-)


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