[Gpg4win-commits] r664 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-01-03 14:07:05 +0100 (Thu, 03 Jan 2008)
New Revision: 664

Modified:
   trunk/ChangeLog
   trunk/src/inst-gnupg.nsi
Log:
Dele registry key gpgProgram


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-01-03 12:19:04 UTC (rev 663)
+++ trunk/ChangeLog	2008-01-03 13:07:05 UTC (rev 664)
@@ -1,5 +1,7 @@
 2008-01-03  Werner Koch  <wk at g10code.com>
 
+	* src/inst-gnupg.nsi: Do not set gpgProgram but delete it.
+
 	* patches/gpgme/01-gpg2.patch: New.
 	* Makefile.am (EXTRA_DIST): Add it.
 

Modified: trunk/src/inst-gnupg.nsi
===================================================================
--- trunk/src/inst-gnupg.nsi	2008-01-03 12:19:04 UTC (rev 663)
+++ trunk/src/inst-gnupg.nsi	2008-01-03 13:07:05 UTC (rev 664)
@@ -78,7 +78,11 @@
 
   # This old key is required for GPGee.  Please do not use in new
   # applications.
-  WriteRegStr HKLM "Software\GNU\GnuPG" "gpgProgram" "$INSTDIR\gpg.exe"
+  # Note: We don't use it anymore so that gpgme decides what gpg to use
+  #       For the new gpg4win we actually use gpg2.exe.
+  #       To cope with old installations we actually remove this vale.
+  #WriteRegStr HKLM "Software\GNU\GnuPG" "gpgProgram" "$INSTDIR\gpg.exe"
+  DeleteRegValue HKLM "Software\GNU\GnuPG" "gpgProgram"
 
   # Add the public directory to the PATH
   Push "$INSTDIR\pub"