[svn] assuan - r214 - in trunk: . src

[svn author wk]

Author: wk
Date: 2006-10-04 19:03:36 +0200 (Wed, 04 Oct 2006)
New Revision: 214

Modified:
   trunk/NEWS
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/assuan-client.c
Log:
Littel fix to make Cancel returns from pinnetry work again. 
(At least with the forthcoming gnupg 1.9.91)


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-10-04 09:47:45 UTC (rev 213)
+++ trunk/NEWS	2006-10-04 17:03:36 UTC (rev 214)
@@ -1,3 +1,7 @@
+Noteworthy changes in version 0.9.2
+------------------------------------------------
+
+
 Noteworthy changes in version 0.9.1 (2006-10-04)
 ------------------------------------------------
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-10-04 09:47:45 UTC (rev 213)
+++ trunk/configure.ac	2006-10-04 17:03:36 UTC (rev 214)
@@ -25,7 +25,7 @@
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(libassuan, 0.9.1, gnupg-devel at gnupg.org)
+AC_INIT(libassuan, 0.9.2-cvs, gnupg-devel at gnupg.org)
 # Note, that this is not yet available as a shared library.
 
 PACKAGE=$PACKAGE_NAME

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2006-10-04 09:47:45 UTC (rev 213)
+++ trunk/src/ChangeLog	2006-10-04 17:03:36 UTC (rev 214)
@@ -1,3 +1,8 @@
+2006-10-04  Werner Koch  <wk at g10code.com>
+
+	* assuan-client.c (assuan_transact): Need to map old assuan status
+	codes so that for example CANCELED is correctly mapped.
+
 2006-09-28  Marcus Brinkmann  <marcus at g10code.de>
 
 	* assuan-client.c (assuan_transact): Do not convert error on

Modified: trunk/src/assuan-client.c
===================================================================
--- trunk/src/assuan-client.c	2006-10-04 09:47:45 UTC (rev 213)
+++ trunk/src/assuan-client.c	2006-10-04 17:03:36 UTC (rev 214)
@@ -162,8 +162,10 @@
   if (!okay)
     {
       rc = atoi (line);
-      if (rc < 100)
+      if (rc > 0 && rc < 100)
         rc = _assuan_error (ASSUAN_Server_Fault);
+      else if (rc > 0 && rc <= 128)
+        rc = _assuan_error (rc);
     }
   else if (okay == 2)
     {