[git] GpgOL - branch, master, updated. gpgol-2.3.0-65-g68191e5

by Andre Heinecke cvs at cvs.gnupg.org
Fri Sep 28 15:14:53 CEST 2018


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  68191e53049bf88aab4dbbab5427b5d0c90ead05 (commit)
      from  d87848059727587be1f660283e0aeb3be16cc382 (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 68191e53049bf88aab4dbbab5427b5d0c90ead05
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Sep 28 14:40:57 2018 +0200

    Fix two encoding issues
    
    * src/ribbon-callbacks.cpp (launch_cert_details): Use MessageBoxW.

diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 4587395..2d3604c 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -696,9 +696,13 @@ HRESULT launch_cert_details (LPDISPATCH ctrl)
       gpgrt_asprintf (&buf, _("The message was not cryptographically signed.\n"
                       "There is no additional information available if it "
                       "was actually sent by '%s' or if someone faked the sender address."), mail->getSender_o ().c_str());
-      MessageBox (NULL, buf, _("GpgOL"),
-                  MB_ICONINFORMATION|MB_OK);
+      wchar_t *w_msg = utf8_to_wchar (buf);
+      wchar_t *w_title = utf8_to_wchar (_("GpgOL"));
+      MessageBoxW (NULL, w_msg, w_title,
+                   MB_ICONINFORMATION|MB_OK);
       xfree (buf);
+      xfree (w_msg);
+      xfree (w_title);
       return S_OK;
     }
 
@@ -756,11 +760,13 @@ HRESULT launch_cert_details (LPDISPATCH ctrl)
 
   if (showError)
     {
-      MessageBox (NULL,
-                  _("Could not find Kleopatra.\n"
-                  "Please reinstall Gpg4win with the Kleopatra component enabled."),
-                  _("GpgOL"),
-                  MB_ICONINFORMATION|MB_OK);
+      wchar_t *w_title = utf8_to_wchar (_("GpgOL"));
+      wchar_t *w_msg = utf8_to_wchar (_("Could not find Kleopatra.\n"
+                  "Please reinstall Gpg4win with the Kleopatra component enabled."));
+      MessageBoxW (NULL, w_msg, w_title,
+                   MB_ICONINFORMATION|MB_OK);
+      xfree (w_title);
+      xfree (w_msg);
     }
   return S_OK;
 }

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

Summary of changes:
 src/ribbon-callbacks.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)


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




More information about the Gnupg-commits mailing list