[git] GpgOL - branch, master, updated. gpgol-1.3.0-7-g3268854

[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  32688545e91e84d88cab9837da715861420acfd7 (commit)
      from  ed1122988eddb34e22ac37344a1ca2b328abdd4d (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 32688545e91e84d88cab9837da715861420acfd7
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Nov 27 17:22:41 2015 +0100

    Fix reg key lookup for x64 and prep for new key
    
    * src/common.h (GNUPG_REGKEY): Use 32 bit key on 64 bit. Prepare
      for gpg4win 3. Key layout

diff --git a/src/common.h b/src/common.h
index 379a55c..ea003b9 100644
--- a/src/common.h
+++ b/src/common.h
@@ -34,9 +34,19 @@ extern "C" {
 #endif
 
 /* The Registry key used by GnuPg and closley related software.  */
-#define GNUPG_REGKEY  "Software\\GNU\\GnuPG"
-
-
+#ifndef NEW_STYLE_REG_KEYS /* Gpg4win 3 changed the key */
+# ifdef WIN64
+#  define GNUPG_REGKEY  "Software\\Wow6432Node\\GNU\\GnuPG"
+# else
+#  define GNUPG_REGKEY  "Software\\GNU\\GnuPG"
+# endif
+# else
+# ifdef WIN64
+#  define GNUPG_REGKEY  "Software\\Wow6432Node\\Gpg4win"
+# else
+#  define GNUPG_REGKEY  "Software\\Gpg4win"
+# endif
+#endif
 /* Identifiers for the protocol.  We use different one than those use
    by gpgme.  FIXME: We might want to define an unknown protocol to
    non-null and define such a value also in gpgme. */

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

Summary of changes:
 src/common.h | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)


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