[svn] gpgme - r1329 - trunk/gpgme

[svn author marcus]

Author: marcus
Date: 2008-08-08 19:53:22 +0200 (Fri, 08 Aug 2008)
New Revision: 1329

Modified:
   trunk/gpgme/ChangeLog
   trunk/gpgme/rungpg.c
Log:

2008-08-08  Marcus Brinkmann  <marcus at g10code.com>

	* rungpg.c (command_handler): Remove I/O callback on error, too.



Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog	2008-07-17 17:09:39 UTC (rev 1328)
+++ trunk/gpgme/ChangeLog	2008-08-08 17:53:22 UTC (rev 1329)
@@ -1,3 +1,7 @@
+2008-08-08  Marcus Brinkmann  <marcus at g10code.com>
+
+	* rungpg.c (command_handler): Remove I/O callback on error, too.
+
 2008-06-29  Marcus Brinkmann  <marcus at ulysses.g10code.com>
 
 	* gpgme.c (gpgme_cancel_async): Remove unused variable.

Modified: trunk/gpgme/rungpg.c
===================================================================
--- trunk/gpgme/rungpg.c	2008-07-17 17:09:39 UTC (rev 1328)
+++ trunk/gpgme/rungpg.c	2008-08-08 17:53:22 UTC (rev 1329)
@@ -645,13 +645,7 @@
 
   err = gpg->cmd.fnc (gpg->cmd.fnc_value, gpg->cmd.code, gpg->cmd.keyword, fd,
 		      &processed);
-  if (err)
-    return err;
 
-  /* We always need to send at least a newline character.  */
-  if (!processed)
-    _gpgme_io_write (fd, "\n", 1);
-
   gpg->cmd.code = 0;
   /* And sleep again until read_status will wake us up again.  */
   /* XXX We must check if there are any more fds active after removing
@@ -660,6 +654,13 @@
   gpg->cmd.fd = gpg->fd_data_map[gpg->cmd.idx].fd;
   gpg->fd_data_map[gpg->cmd.idx].fd = -1;
 
+  if (err)
+    return err;
+
+  /* We always need to send at least a newline character.  */
+  if (!processed)
+    _gpgme_io_write (fd, "\n", 1);
+
   return 0;
 }