[svn] GpgOL - r223 - trunk/src

[svn author marcus]

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

Modified:
   trunk/src/ChangeLog
   trunk/src/engine-assuan.c
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-18 11:16:44 UTC (rev 222)
+++ trunk/src/ChangeLog	2008-02-19 16:03:56 UTC (rev 223)
@@ -1,3 +1,8 @@
+2008-02-19  Marcus Brinkmann  <marcus at g10code.de>
+
+	* engine-assuan.c (get_uiserver_name): Change default uiserver
+	path and remove work-around.
+
 2008-02-18  Werner Koch  <wk at g10code.com>
 
 	* message.cpp (pgp_body_to_attachment): New.

Modified: trunk/src/engine-assuan.c
===================================================================
--- trunk/src/engine-assuan.c	2008-02-18 11:16:44 UTC (rev 222)
+++ trunk/src/engine-assuan.c	2008-02-19 16:03:56 UTC (rev 223)
@@ -318,13 +318,8 @@
       uiserver = read_w32_registry_string (NULL, GNUPG_REGKEY, 
                                            "UI Server");
       if (!uiserver)
-        uiserver = xstrdup ("bin\\kleopatra.exe --daemon");
+        uiserver = xstrdup ("kleopatra.exe --daemon");
 
-      /* FIXME: Very dirty work-around to make kleopatra find its
-         DLLs.  */
-      if (!strncmp (uiserver, "bin\\kleopatra.exe", 17))
-        chdir (dir);
-
       name = xmalloc (strlen (dir) + strlen (uiserver) + 2);
       strcpy (stpcpy (stpcpy (name, dir), "\\"), uiserver);
       for (p = name; *p; p++)