[svn] GpgEX - r49 - trunk/src

[svn author marcus]

Author: marcus
Date: 2008-02-19 17:03:19 +0100 (Tue, 19 Feb 2008)
New Revision: 49

Modified:
   trunk/src/ChangeLog
   trunk/src/client.cc
Log:
2008-02-19  Marcus Brinkmann  <marcus at g10code.de>

	* client.cc (default_uiserver_cmdline): Change default uiserver
	path and remove work-around.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-02-05 00:16:02 UTC (rev 48)
+++ trunk/src/ChangeLog	2008-02-19 16:03:19 UTC (rev 49)
@@ -1,3 +1,8 @@
+2008-02-19  Marcus Brinkmann  <marcus at g10code.de>
+
+	* client.cc (default_uiserver_cmdline): Change default uiserver
+	path and remove work-around.
+
 2008-02-05  Marcus Brinkmann  <marcus at g10code.de>
 
 	* debug.h: Include <stdio.h>.

Modified: trunk/src/client.cc
===================================================================
--- trunk/src/client.cc	2008-02-05 00:16:02 UTC (rev 48)
+++ trunk/src/client.cc	2008-02-19 16:03:19 UTC (rev 49)
@@ -82,15 +82,10 @@
 	    {
 	      /* The option --use-standard-socket is the default on
 		 windows, so we can omit it here.  */
-	      uiserver = "bin\\kleopatra.exe --daemon";
+	      uiserver = "kleopatra.exe --daemon";
 	      uiserver_malloced = 0;
 	    }
 
-	  /* FIXME: Very dirty work-around to make kleopatra find
-	     its DLLs.  */
-	  if (!strncmp (uiserver, "bin\\kleopatra.exe", 17))
-	    chdir (dir);
-	  
 	  try { name = ((string) dir) + "\\" + uiserver; } catch (...) {}
 	  
 	  if (uiserver_malloced)