[svn] GpgEX - r43 - trunk/src

[svn author marcus]

Author: marcus
Date: 2007-11-16 16:19:43 +0100 (Fri, 16 Nov 2007)
New Revision: 43

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

	* gpgex.cc (start_help): Fix URL for Windows Exploder.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2007-11-12 13:21:58 UTC (rev 42)
+++ trunk/src/ChangeLog	2007-11-16 15:19:43 UTC (rev 43)
@@ -1,3 +1,7 @@
+2007-11-16  Marcus Brinkmann  <marcus at g10code.de>
+
+	* gpgex.cc (start_help): Fix URL for Windows Exploder.
+
 2007-11-12  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpgex.cc (get_lang_name): Fix last change.

Modified: trunk/src/gpgex.cc
===================================================================
--- trunk/src/gpgex.cc	2007-11-12 13:21:58 UTC (rev 42)
+++ trunk/src/gpgex.cc	2007-11-16 15:19:43 UTC (rev 43)
@@ -518,9 +518,15 @@
     if (!dir)
       _snwprintf (url, URLSIZE, L"%S", "http://www.gpg4win.org/");
     else
-      _snwprintf (url,
-		  URLSIZE, L"file:///%S\\share\\doc\\gpgex\\gpgex-%S.html",
-		  dir, get_lang_name ());
+      {
+	int sep = 0;
+	int len = strlen (dir) - 1;
+	if (len >= 0 && (dir[len] == '\\' || dir[len] == '/'))
+	  sep = 1;
+	_snwprintf (url,
+		    URLSIZE, L"file:///%S%Sshare\\doc\\gpgex\\gpgex-%S.html",
+		    dir, get_lang_name (), sep ? "" : "\\");
+      }
     url[URLSIZE - 1] = '\0';
   }