[git] GpgOL - branch, master, updated. gpgol-1.4.0-235-g1e42345

[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  1e42345f8fed6c9d9ec10c87b4b23d79dc7fb9de (commit)
      from  5e4374f2f617bc322c2e13b54a588ac2d2092d2a (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 1e42345f8fed6c9d9ec10c87b4b23d79dc7fb9de
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Jan 5 17:25:44 2017 +0100

    Allow different UUIDs for the same mail
    
    * src/oomhelp.cpp (get_unique_id): Always create one if
    called with create parameter.
    
    --
    Outlook can have multiple Event Handler for the Same Mail.
    E.g. If you attach a mail to another mail it becomes so decoupled
    that it has it's own event handler.
    
    We must handle that case to avoid messing up or event handling /
    internal state. It is now:
    One UUID for One mailitem-events handler.

diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index 9570eaf..87665d2 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -1621,22 +1621,21 @@ get_unique_id (LPDISPATCH mail, int create, const char *uuid)
     }
 
   /* Get the User Properties. */
-  char *uid = get_pa_string (mail, GPGOL_UID_DASL);
-  if (!uid)
+  if (!create)
     {
-      log_debug ("%s:%s: No uuid found in oom for '%p'",
-                 SRCNAME, __func__, mail);
-
-      if (!create)
+      char *uid = get_pa_string (mail, GPGOL_UID_DASL);
+      if (!uid)
         {
+          log_debug ("%s:%s: No uuid found in oom for '%p'",
+                     SRCNAME, __func__, mail);
           return NULL;
         }
-    }
-  else
-    {
-      log_debug ("%s:%s: Found uid '%s' for '%p'",
-                 SRCNAME, __func__, uid, mail);
-      return uid;
+      else
+        {
+          log_debug ("%s:%s: Found uid '%s' for '%p'",
+                     SRCNAME, __func__, uid, mail);
+          return uid;
+        }
     }
   char *newuid;
   if (!uuid)

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

Summary of changes:
 src/oomhelp.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)


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