[svn] GpgEX - r50 - trunk/src

[svn author marcus]

Author: marcus
Date: 2008-03-26 18:02:48 +0100 (Wed, 26 Mar 2008)
New Revision: 50

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

	* client.cc (default_uiserver_cmdline): Fall back to GPA if
	Kleopatra is not installed.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-02-19 16:03:19 UTC (rev 49)
+++ trunk/src/ChangeLog	2008-03-26 17:02:48 UTC (rev 50)
@@ -1,3 +1,8 @@
+2008-03-26  Marcus Brinkmann  <marcus at g10code.de>
+
+	* client.cc (default_uiserver_cmdline): Fall back to GPA if
+	Kleopatra is not installed.
+
 2008-02-19  Marcus Brinkmann  <marcus at g10code.de>
 
 	* client.cc (default_uiserver_cmdline): Change default uiserver

Modified: trunk/src/client.cc
===================================================================
--- trunk/src/client.cc	2008-02-19 16:03:19 UTC (rev 49)
+++ trunk/src/client.cc	2008-03-26 17:02:48 UTC (rev 50)
@@ -78,16 +78,25 @@
 	  int uiserver_malloced = 1;
 	  
 	  uiserver = read_w32_registry_string (NULL, REGKEY, "UI Server");
-	  if (!uiserver)
+	  if (! uiserver)
 	    {
+	      string fname;
+
+	      uiserver_malloced = 0;
+	      
+	      try { fname = ((string) dir) + "\\"
+		  + "kleopatra.exe"; } catch (...) {}
+
 	      /* The option --use-standard-socket is the default on
 		 windows, so we can omit it here.  */
-	      uiserver = "kleopatra.exe --daemon";
-	      uiserver_malloced = 0;
+	      if (! access (fname.c_str (), F_OK))
+		uiserver = "kleopatra.exe --daemon";
+	      else
+		uiserver = "gpa.exe --daemon";
 	    }
 
 	  try { name = ((string) dir) + "\\" + uiserver; } catch (...) {}
-	  
+
 	  if (uiserver_malloced)
 	    free (uiserver);
 	  free ((void *) dir);