[git] GpgEX - branch, master, updated. gpgex-1.0.1-4-g0b77490

[by Werner Koch]

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  0b7749092debfca4751e46e8149ff31faa707b82 (commit)
       via  f8898a3527631eca8becba00f9a118a207b851a5 (commit)
      from  b62f4a371ac804ab40c2c5ed0cd5e1d9900add4f (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 0b7749092debfca4751e46e8149ff31faa707b82
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Nov 3 11:04:45 2014 +0100

    Really send the window-id to the server.
    
    * src/client.cc (send_options): Fix test for 64 bit HWND.

diff --git a/README b/README
index 99b5ebd..321f070 100644
--- a/README
+++ b/README
@@ -16,6 +16,8 @@ HKLM\Software\GNU\GnuPG:UI Server
   The path to the executable binary of the UI server, relative to
   INSTDIR.  Absolute paths are currently not supported.  It defaults
   to the empty sting, so that the UI server is expected in INSTDIR.
+  If the configure option --enable-gpa-only is used these registry
+  entries have no effect.
 
 HKCU\Software\GNU\GnuPG:HomeDir
 HKLM\Software\GNU\GnuPG:HomeDir
diff --git a/src/client.cc b/src/client.cc
index 7472fd2..6aaa0f6 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -304,7 +304,7 @@ send_options (assuan_context_t ctx, HWND hwnd, pid_t *r_pid)
          window-id.  */
       uintptr_t tmp = (uintptr_t)hwnd;
 
-      if (tmp & ~0xffffffff)
+      if (!(tmp & ~0xffffffff))
         {
           /* HWND fits into 32 bit - send it. */
           snprintf (numbuf, sizeof (numbuf), "%lx", (unsigned long)tmp);

commit f8898a3527631eca8becba00f9a118a207b851a5
Author: Werner Koch <wk at gnupg.org>
Date:   Sun Nov 2 20:23:15 2014 +0100

    Add configure option to use only gpa as UI-server.
    
    * configure.ac: Add option --enable-gpa-only
    * src/client.cc (default_uiserver_cmdline) [ENABLE_GPA_ONLY]: Try only
    GPA as UI-server.
    --
    
    We also make sure to start a gpa below the bin directory.
    Using this option also ignores any registry setting for the UI-server.

diff --git a/configure.ac b/configure.ac
index 9c43ba1..10f51ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,6 +153,17 @@ fi
 AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
 AM_CONDITIONAL(HAVE_W64_SYSTEM, test "$have_w64_system" = yes)
 
+gpa_only=no
+AC_ARG_ENABLE(gpa-only,
+              AC_HELP_STRING([--enable-gpa-only],
+                             [Try only GPA as UI-server]),
+              gpa_only=$enableval)
+AC_MSG_RESULT($gpa_only)
+if test "$gpa_only" = yes ; then
+    AC_DEFINE(ENABLE_GPA_ONLY, 1,
+             [Define to use only GPA as UI-server])
+fi
+
 
 #
 # Checks for libraries.
diff --git a/src/client.cc b/src/client.cc
index 6868835..7472fd2 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -86,6 +86,27 @@ default_uiserver_cmdline (void)
   static char *name;
 
   if (!name)
+#if ENABLE_GPA_ONLY
+    {
+      const char gpaserver[] = "bin\\launch-gpa.exe";
+      const char *dir;
+      char *p;
+
+      dir = gpgex_server::root_dir;
+      if (!dir)
+        return NULL;
+
+      name = (char*)malloc (strlen (dir) + strlen (gpaserver) + 9 + 2);
+      if (!name)
+        return NULL;
+      strcpy (stpcpy (stpcpy (name, dir), "\\"), gpaserver);
+      for (p = name; *p; p++)
+        if (*p == '/')
+          *p = '\\';
+      strcat (name, " --daemon");
+      gpgex_server::ui_server = "GPA";
+    }
+#else /*!ENABLE_GPA_ONLY*/
     {
       const char *dir;
       char *uiserver, *p;
@@ -149,6 +170,7 @@ default_uiserver_cmdline (void)
       else
         gpgex_server::ui_server = NULL;
     }
+#endif /*!ENABLE_GPA_ONLY*/
 
   return name;
 }

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

Summary of changes:
 README        |    2 ++
 configure.ac  |   11 +++++++++++
 src/client.cc |   24 +++++++++++++++++++++++-
 3 files changed, 36 insertions(+), 1 deletion(-)


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