[git] GpgOL - branch, master, updated. gpgol-1.4.0-2-ga10532b

[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  a10532b6cf3527391bdb14470fbebf0205b9253a (commit)
      from  e138ceb8fee0b154a0388055d8a0bb1404dc0e06 (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 a10532b6cf3527391bdb14470fbebf0205b9253a
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jun 28 10:47:38 2016 +0200

    Fix UI Server startup
    
    * src/common.c (get_gpg4win_dir): Fix stupid logic error in loop.
    Fix mem leak on error.
    * src/engine-assuan.c (get_uiserver_name): Prefer 2.3.x names to
    prefer the kleowrapped / gpgwrapped exectuables.
    
    --
    Thanks to rpr who reported this on the gpg4win message board.

diff --git a/src/common.c b/src/common.c
index b7b48b0..9b554b2 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1245,10 +1245,10 @@ get_gpg4win_dir()
   const char *g4win_keys[] = {GPG4WIN_REGKEY_3,
                               GPG4WIN_REGKEY_2,
                               NULL};
-  const char *key;
-  for (key = *g4win_keys; *key; key++)
+  const char **key;
+  for (key = g4win_keys; *key; key++)
     {
-      char *tmp = read_w32_registry_string (NULL, key, "Install Directory");
+      char *tmp = read_w32_registry_string (NULL, *key, "Install Directory");
       if (!tmp)
         {
           continue;
@@ -1257,6 +1257,11 @@ get_gpg4win_dir()
         {
           return tmp;
         }
+      else
+        {
+          log_debug ("Failed to access: %s\n", tmp);
+          xfree (tmp);
+        }
     }
   return NULL;
 }
diff --git a/src/engine-assuan.c b/src/engine-assuan.c
index f2e0b09..32dbae8 100644
--- a/src/engine-assuan.c
+++ b/src/engine-assuan.c
@@ -348,10 +348,10 @@ get_uiserver_name (void)
   char *dir, *uiserver, *p;
   int extra_arglen = 9;
 
-  const char * server_names[] = {"bin\\kleopatra.exe",
-                                 "kleopatra.exe",
-                                 "bin\\gpa.exe",
+  const char * server_names[] = {"kleopatra.exe",
+                                 "bin\\kleopatra.exe",
                                  "gpa.exe",
+                                 "bin\\gpa.exe",
                                  NULL};
   const char *tmp = NULL;
 

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

Summary of changes:
 src/common.c        | 11 ++++++++---
 src/engine-assuan.c |  6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)


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