[svn] GpgEX - r38 - trunk/src

[svn author marcus]

Author: marcus
Date: 2007-11-08 17:43:26 +0100 (Thu, 08 Nov 2007)
New Revision: 38

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

	* client.cc (client_t::call_assuan): Fix FILE command and rename
	all commands to the protocol version.
	(client_t::call_assuan): Report the actual error and remove log
	file reference.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2007-11-02 11:01:07 UTC (rev 37)
+++ trunk/src/ChangeLog	2007-11-08 16:43:26 UTC (rev 38)
@@ -1,3 +1,10 @@
+2007-11-08  Marcus Brinkmann  <marcus at g10code.de>
+
+	* client.cc (client_t::call_assuan): Fix FILE command and rename
+	all commands to the protocol version.
+	(client_t::call_assuan): Report the actual error and remove log
+	file reference.
+
 2007-11-02  Werner Koch  <wk at g10code.com>
 
 	* w32-gettext.c (SUBLANG_BENGALI_BANGLADESH): Fix to 2 as per MSDN.

Modified: trunk/src/client.cc
===================================================================
--- trunk/src/client.cc	2007-11-02 11:01:07 UTC (rev 37)
+++ trunk/src/client.cc	2007-11-08 16:43:26 UTC (rev 38)
@@ -308,7 +308,7 @@
       /* Set the input files.  We don't specify the output files.  */
       for (unsigned int i = 0; i < filenames.size (); i++)
 	{
-	  msg = "FILE=" + escape (filenames[i]);
+	  msg = "FILE " + escape (filenames[i]);
 	  
 	  (void) TRACE_LOG1 ("sending cmd: %s", msg.c_str ());
 	  
@@ -341,9 +341,10 @@
     assuan_disconnect (ctx);
   if (rc)
     {
-      MessageBox (this->window,
-		  _("Can not access Kleopatra, see log file for details"),
-		  "GpgEX", MB_ICONINFORMATION);
+      char buf[256];
+      snprintf (buf, sizeof (buf), _("Can not access Kleopatra:\r\n%s"),
+		gpg_strerror (buf));
+      MessageBox (this->window, buf, "GpgEX", MB_ICONINFORMATION);
     }
 
   return rc ? false : true;
@@ -353,61 +354,61 @@
 void
 client_t::decrypt_verify (vector<string> &filenames)
 {
-  this->call_assuan ("DECRYPT_VERIFY", filenames);
+  this->call_assuan ("DECRYPT_VERIFY_FILES", filenames);
 }
 
 
 void
 client_t::verify (vector<string> &filenames)
 {
-  this->call_assuan ("VERIFY", filenames);
+  this->call_assuan ("VERIFY_FILES", filenames);
 }
 
 
 void
 client_t::decrypt (vector<string> &filenames)
 {
-  this->call_assuan ("DECRYPT", filenames);
+  this->call_assuan ("DECRYPT_FILES", filenames);
 }
 
 
 void
 client_t::encrypt_sign (vector<string> &filenames)
 {
-  this->call_assuan ("ENCRYPT_SIGN", filenames);
+  this->call_assuan ("ENCRYPT_SIGN_FILES", filenames);
 }
 
 
 void
 client_t::encrypt (vector<string> &filenames)
 {
-  this->call_assuan ("ENCRYPT", filenames);
+  this->call_assuan ("ENCRYPT_FILES", filenames);
 }
 
 
 void
 client_t::sign (vector<string> &filenames)
 {
-  this->call_assuan ("SIGN", filenames);
+  this->call_assuan ("SIGN_FILES", filenames);
 }
 
 
 void
 client_t::import (vector<string> &filenames)
 {
-  this->call_assuan ("IMPORT", filenames);
+  this->call_assuan ("IMPORT_FILES", filenames);
 }
 
 
 void
 client_t::create_checksums (vector<string> &filenames)
 {
-  this->call_assuan ("CREATE_CHECKSUMS", filenames);
+  this->call_assuan ("CHECKSUM_CREATE_FILES", filenames);
 }
 
 
 void
 client_t::verify_checksums (vector<string> &filenames)
 {
-  this->call_assuan ("VERIFY_CHECKSUMS", filenames);
+  this->call_assuan ("CHECKSUM_VERIFY_FILES", filenames);
 }