[git] GpgOL - branch, master, updated. gpgol-1.4.0-166-gb405ba1

[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  b405ba1bddc587ea634182330d6f0d834a0bf75e (commit)
      from  9560e555e86fa9b5b59829bc9bd5b7f6ff6308e1 (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 b405ba1bddc587ea634182330d6f0d834a0bf75e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Nov 15 10:48:16 2016 +0100

    Fix check for gpgme-w32spawn
    
    * src/main.cpp (get_gpgme_w32_inst_dir): Fix name of
    gpgme-w32spawn.exe

diff --git a/src/main.c b/src/main.c
index c0e64e2..d862b57 100644
--- a/src/main.c
+++ b/src/main.c
@@ -148,7 +148,7 @@ get_gpgme_w32_inst_dir (void)
 {
   char *gpg4win_dir = get_gpg4win_dir ();
   char *tmp;
-  gpgrt_asprintf (&tmp, "%s\\bin\\gpgme-w32-spawn.exe", gpg4win_dir);
+  gpgrt_asprintf (&tmp, "%s\\bin\\gpgme-w32spawn.exe", gpg4win_dir);
 
   if (!access(tmp, R_OK))
     {
@@ -158,15 +158,14 @@ get_gpgme_w32_inst_dir (void)
       return tmp;
     }
   xfree (tmp);
-  gpgrt_asprintf (&tmp, "%s\\gpgme-w32-spawn.exe", gpg4win_dir);
+  gpgrt_asprintf (&tmp, "%s\\gpgme-w32spawn.exe", gpg4win_dir);
 
   if (!access(tmp, R_OK))
     {
       xfree (tmp);
       return gpg4win_dir;
     }
-  log_error("%s:%s: Failed to find gpgme-w32-spawn.exe!",
-            SRCNAME, __func__);
+  OutputDebugString("Failed to find gpgme-w32spawn.exe!");
   return NULL;
 }
 

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

Summary of changes:
 src/main.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


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