[svn] GpgEX - r34 - in trunk: . src

[svn author marcus]

Author: marcus
Date: 2007-10-16 13:11:00 +0200 (Tue, 16 Oct 2007)
New Revision: 34

Modified:
   trunk/README
   trunk/src/ChangeLog
   trunk/src/client.cc
Log:
2007-10-16  Marcus Brinkmann  <marcus at g10code.de>

	* client.cc (default_uiserver_name): Fall back to HKLM for UI Server.


Modified: trunk/README
===================================================================
--- trunk/README	2007-10-16 10:55:22 UTC (rev 33)
+++ trunk/README	2007-10-16 11:11:00 UTC (rev 34)
@@ -4,6 +4,38 @@
 This package contains GpgEX, the GNU Privacy Guard extensions for the
 Windows Explorer shell.
 
+
+Registry Settings
+=================
+
+The following registry entries are read by GpgEX and affect its
+operation:
+
+HKLM\Software\GNU\GnuPG:Install Directory
+  The installation directory of Gpg4Win.  This is used to compose the
+  path to the UI server executable.  Also known as INSTDIR below.  Set
+  by the installer at installation time.
+
+HKCU\Software\GNU\GnuPG:UI Server
+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.
+
+HKCU\Software\GNU\GnuPG:HomeDir
+HKLM\Software\GNU\GnuPG:HomeDir
+  The GnuPG home directory.  Defaults to APPDATA\gnupg.
+
+HKLM\Software\GNU\GnuPG:GpgEX Debug File
+  See below.
+
+The following registry entries are set by GpgEX at installation time
+to register it as a shell extension:
+
+HKCR\CLSID\CCD955E4-5C16-4A33-AFDA-A8947A94946B
+HKCR\*\ShellEx\ContextMenuHandlers\GpgEX
+HKCR\Directory\ShellEx\ContextMenuHandlers\GpgEX
+
+
 Debugging
 =========
 

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2007-10-16 10:55:22 UTC (rev 33)
+++ trunk/src/ChangeLog	2007-10-16 11:11:00 UTC (rev 34)
@@ -1,5 +1,7 @@
 2007-10-16  Marcus Brinkmann  <marcus at g10code.de>
 
+	* client.cc (default_uiserver_name): Fall back to HKLM for UI Server.
+
 	* client.cc (default_uiserver_name): Get UI Server from HKCU.
 
 2007-10-15  Marcus Brinkmann  <marcus at g10code.de>

Modified: trunk/src/client.cc
===================================================================
--- trunk/src/client.cc	2007-10-16 10:55:22 UTC (rev 33)
+++ trunk/src/client.cc	2007-10-16 11:11:00 UTC (rev 34)
@@ -56,8 +56,7 @@
 	  char *uiserver = NULL;
 	  int uiserver_malloced = 1;
 	  
-	  uiserver = read_w32_registry_string ("HKEY_CURRENT_USER", REGKEY,
-					       "UI Server");
+	  uiserver = read_w32_registry_string (NULL, REGKEY, "UI Server");
 	  if (!uiserver)
 	    {
 	      uiserver = "bin\\kleopatra.exe";