[git] GpgOL - branch, master, updated. gpgol-1.2.0-85-g4052dfc

[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  4052dfcc96da23bf617be1e16f771dec4f086cf0 (commit)
      from  b942f73f7961fd277cbafab9d2a5ed08038f00db (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 4052dfcc96da23bf617be1e16f771dec4f086cf0
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Nov 4 11:24:54 2015 +0100

    Fix recipient lookup
    
    * src/message.cpp (get_recipients): Actually fallback to the
      email property in case the smtp address property is not set.

diff --git a/src/message.cpp b/src/message.cpp
index 1d9fb4a..3adc7ed 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -1118,7 +1118,7 @@ get_recipients (LPMESSAGE message)
   LPMAPITABLE lpRecipientTable = NULL;
   LPSRowSet lpRecipientRows = NULL;
   unsigned int rowidx;
-  LPSPropValue row;
+  SPropValue_s val;
   char **rset;
   int rsetidx;
 
@@ -1151,12 +1151,12 @@ get_recipients (LPMESSAGE message)
       for (int colidx = 0; colidx < lpRecipientRows->aRow[rowidx].cValues;
            colidx++)
         {
-          row = lpRecipientRows->aRow[rowidx].lpProps;
+          val = lpRecipientRows->aRow[rowidx].lpProps[colidx];
 
-          switch (PROP_TYPE (row->ulPropTag))
+          switch (PROP_TYPE (val.ulPropTag))
             {
             case PT_UNICODE:
-              if ((rset[rsetidx] = wchar_to_utf8 (row->Value.lpszW)))
+              if ((rset[rsetidx] = wchar_to_utf8 (val.Value.lpszW)))
                 {
                   rsetidx++;
                   found_one = true;
@@ -1167,13 +1167,13 @@ get_recipients (LPMESSAGE message)
               break;
 
             case PT_STRING8: /* Assume ASCII. */
-              rset[rsetidx++] = xstrdup (row->Value.lpszA);
+              rset[rsetidx++] = xstrdup (val.Value.lpszA);
               found_one = true;
               break;
 
             default:
               log_debug ("%s:%s: proptag=0x%08lx not supported\n",
-                         SRCNAME, __func__, row->ulPropTag);
+                         SRCNAME, __func__, val.ulPropTag);
               break;
             }
           if (found_one)

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

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


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