[git] GpgOL - branch, master, updated. gpgol-1.4.0-198-gb3fdbb2

[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  b3fdbb2244f2d049b458160d7f3da6340745ad7a (commit)
      from  1bc698e7d222120abf87e103771551c2d374ed2b (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 b3fdbb2244f2d049b458160d7f3da6340745ad7a
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Dec 1 16:47:39 2016 +0100

    Change wording to better distinguish fully trusted
    
    * src/mail.cpp (Mail::get_signature_status): Distinguish between
    trusted and fully trusted.
    * src/ribbon-callbacks.cpp (get_sig_label): Use three labels
    instead of two.
    
    --
    Only changing the icon color was a too weak distinction. Especially
    regarding accessibility.

diff --git a/src/mail.cpp b/src/mail.cpp
index 1882ea0..b8e02ac 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -1423,7 +1423,15 @@ Mail::get_signature_status()
       const auto uid = pair.second;
       /* We are valid */
       keyFound = true;
-      message += _("The sender address is trusted because:");
+      if (sig.validity() == Signature::Validity::Full ||
+          sig.validity() == Signature::Validity::Ultimate)
+        {
+          message += _("The sender address is fully trusted because:");
+        }
+      else
+        {
+          message += _("The sender address is trusted because:");
+        }
       message += "\n\n";
       message += isOpenPGP ? _("The used key") : _("The used certificate");
       message += " ";
diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 5930775..f02ab89 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -1526,13 +1526,21 @@ HRESULT get_sig_label (LPDISPATCH ctrl, VARIANT *result)
       log_debug ("%s:%s: No mail.",
                  SRCNAME, __func__);
     }
-  if (mail && mail->is_valid_sig ())
+  bool valid = mail->is_valid_sig ();
+  const auto pair = mail->get_valid_sig ();
+  bool fully = pair.first.validity() == GpgME::Signature::Validity::Full ||
+               pair.first.validity() == GpgME::Signature::Validity::Ultimate;
+  if (valid && fully)
     {
-      w_result = utf8_to_wchar (_("Trusted Address"));
+      w_result = utf8_to_wchar (_("Fully Trusted"));
+    }
+  else if (valid)
+    {
+      w_result = utf8_to_wchar (_("Trusted"));
     }
   else
     {
-      w_result = utf8_to_wchar (_("Untrusted Address"));
+      w_result = utf8_to_wchar (_("Not Trusted"));
     }
   result->bstrVal = SysAllocString (w_result);
   xfree (w_result);

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

Summary of changes:
 src/mail.cpp             | 10 +++++++++-
 src/ribbon-callbacks.cpp | 14 +++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)


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