[git] GpgOL - branch, master, updated. gpgol-1.4.0-163-gba6e9a8

[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  ba6e9a8c468fdde33a238099664762695b31c2ad (commit)
      from  1b822ad2b8142fb7020615875a64328c44362907 (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 ba6e9a8c468fdde33a238099664762695b31c2ad
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Nov 14 18:17:24 2016 +0100

    Fix errors from 1b822ad2
    
    * src/mail.cpp: Fix utf8 macro.
    (Mail::get_signature_status): Fix typo.
    * src/mailitem-events.cpp: Fix utf8 macro.
    
    --
    One should never push without compiling.

diff --git a/src/mail.cpp b/src/mail.cpp
index fc79787..ee864e3 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -45,11 +45,9 @@
 #include <vector>
 #include <memory>
 
+
 #undef _
-# define _(a) utf8_gettext (a)
-#else
-# define _(a) a
-#endif
+#define _(a) utf8_gettext (a)
 
 using namespace GpgME;
 
@@ -1460,12 +1458,12 @@ Mail::get_signature_status()
   if (keyFound)
     {
       message +=  isOpenPGP ? _("Click here for details about the key.") :
-                              _("Click here for details about the key."):
+                              _("Click here for details about the key.");
     }
   else
     {
       message +=  isOpenPGP ? _("Click here to search the key on the configured keyserver.") :
-                              _("Click here to search the certificate on the configured X509 keyserver."):
+                              _("Click here to search the certificate on the configured X509 keyserver.");
     }
   message += buf;
   xfree (buf);
diff --git a/src/mailitem-events.cpp b/src/mailitem-events.cpp
index a26eadd..29ff764 100644
--- a/src/mailitem-events.cpp
+++ b/src/mailitem-events.cpp
@@ -29,10 +29,7 @@
 #include "mapihelp.h"
 
 #undef _
-# define _(a) utf8_gettext (a)
-#else
-# define _(a) a
-#endif
+#define _(a) utf8_gettext (a)
 
 const wchar_t *prop_blacklist[] = {
   L"Body",

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

Summary of changes:
 src/mail.cpp            | 10 ++++------
 src/mailitem-events.cpp |  5 +----
 2 files changed, 5 insertions(+), 10 deletions(-)


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