[git] GpgEX - branch, master, updated. gpgex-1.0.4-3-g5c19ffe

[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 the Windows Explorer".

The branch, master has been updated
       via  5c19ffe9d71d6e6763d6e47a67f1ca0a1651e39f (commit)
      from  689b4d294bf2a9c54e445e6775df9f634d84df1f (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 5c19ffe9d71d6e6763d6e47a67f1ca0a1651e39f
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jun 28 11:00:53 2016 +0200

    Prefer kleowrapped / gpgwrapped binaries
    
    * src/client.cc (default_uiserver_cmdline): Prefer non "bin" prefixed
    paths.
    
    --
    With Gpg4win-2.x we need to start the "wrapped" binaries if they
    don't exist we are probably in gpg4win-3.x and can fall back to
    the binaries in the bin subdirectory.

diff --git a/src/client.cc b/src/client.cc
index ebf82a8..6f27175 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -111,12 +111,12 @@ default_uiserver_cmdline (void)
       const char *dir, *tmp;
       char *uiserver, *p;
       int extra_arglen = 9;
-      const char * server_names[] = {"bin\\kleopatra.exe",
-                                     "kleopatra.exe",
-                                     "bin\\launch-gpa.exe",
+      const char * server_names[] = {"kleopatra.exe",
+                                     "bin\\kleopatra.exe",
                                      "launch-gpa.exe",
-                                     "bin\\gpa.exe",
+                                     "bin\\launch-gpa.exe",
                                      "gpa.exe",
+                                     "bin\\gpa.exe",
                                      NULL};
 
       dir = gpgex_server::root_dir;

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

Summary of changes:
 src/client.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnupG extension for the Windows Explorer
http://git.gnupg.org