[git] GpgOL - branch, master, updated. gpgol-2.0.1-16-g75aae17

[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  75aae1762f6a4e75f98475f26656e78bb101cc8a (commit)
       via  53754aad930c1f9944cebdb9d0e11b742687c25d (commit)
      from  c5ed287937bbcb894549fd4ec4ac696425189aea (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 75aae1762f6a4e75f98475f26656e78bb101cc8a
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Nov 16 09:42:59 2017 +0100

    Fix Outlook 2010 TabComposeTools error
    
    * src/gpgoladdin.cpp (GetCustomUI_mime): Handle OL2010
    differently.
    
    --
    For OL2010 we don't have an inline editor so no TabComposeTools.
    
    GnuPG-Bug-ID: T3441

diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 0f3d0d9..d8931de 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -911,7 +911,7 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
     }
   /* We don't use this code currently because calling the send
      event for Inline Response mailitems fails. */
-  else if (!wcscmp (RibbonID, L"Microsoft.Outlook.Explorer"))
+  else if (!wcscmp (RibbonID, L"Microsoft.Outlook.Explorer") && g_ol_version_major > 14)
     {
       gpgrt_asprintf (&buffer,
         "<customUI xmlns=\"http://schemas.microsoft.com/office/2009/07/customui\""
@@ -986,6 +986,39 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
         optsSTip
         );
     }
+  else if (!wcscmp (RibbonID, L"Microsoft.Outlook.Explorer"))
+    {
+      // No TabComposeTools in Outlook 2010
+      gpgrt_asprintf (&buffer,
+        "<customUI xmlns=\"http://schemas.microsoft.com/office/2009/07/customui\""
+        " onLoad=\"ribbonLoaded\">"
+        " <ribbon>"
+        "   <tabs>"
+        "    <tab idMso=\"TabMail\">"
+        "     <group id=\"general_read\""
+        "            label=\"%s\">"
+        "       <button id=\"idSigned\""
+        "               getImage=\"btnSigstateLarge\""
+        "               size=\"large\""
+        "               getLabel=\"getSigLabel\""
+        "               getScreentip=\"getSigTip\""
+        "               getSupertip=\"getSigSTip\""
+        "               onAction=\"launchDetails\""
+        "               getEnabled=\"getIsDetailsEnabled\"/>"
+        "       <dialogBoxLauncher>"
+        "         <button id=\"optsBtn_read\""
+        "                 onAction=\"openOptions\""
+        "                 screentip=\"%s\"/>"
+        "       </dialogBoxLauncher>"
+        "     </group>"
+        "    </tab>"
+        "   </tabs>"
+        " </ribbon>"
+        "</customUI>",
+        _("GpgOL"),
+        optsSTip
+        );
+    }
 
   if (buffer)
     {

commit 53754aad930c1f9944cebdb9d0e11b742687c25d
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Nov 16 09:33:46 2017 +0100

    Add comment about ref counting in get_oom_obj
    
    --

diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index 8d6f231..7c47e52 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -196,6 +196,7 @@ get_oom_object (LPDISPATCH pStart, const char *fullname)
           gpgol_release (pObj);
           return NULL;
         }
+      /* Confirmed through testing that the retval needs a release */
       if (pObj != pStart)
         gpgol_release (pObj);
       pObj = NULL;

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

Summary of changes:
 src/gpgoladdin.cpp | 35 ++++++++++++++++++++++++++++++++++-
 src/oomhelp.cpp    |  1 +
 2 files changed, 35 insertions(+), 1 deletion(-)


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