2008-08-11 Marcus Brinkmann <[email protected]>

        * rungpg.c (gpg_cancel): Remove cmd fd before status fd.
        * gpgme.c (_gpgme_cancel_with_err): New function.
        (gpgme_cancel): Reimplement in terms of _gpgme_cancel_with_err.
        * wait-private.c (_gpgme_wait_on_condition): Use
        _gpgme_cancel_with_err.
        * wait-user.c (_gpgme_user_io_cb_handler): Likewise.
        * wait-global.c (_gpgme_wait_global_event_cb, gpgme_wait): Likewise.

1 files changed, 1 insertions, 8 deletions

diff --git a/gpgme/wait-user.c b/gpgme/wait-user.c
index 7fd61a9b..05750e2a 100644
--- a/gpgme/wait-user.c
+++ b/gpgme/wait-user.c
@@ -55,14 +55,7 @@ _gpgme_user_io_cb_handler (void *data, int fd)
   if (! err)
     err = _gpgme_run_io_cb (&ctx->fdt.fds[tag->idx], 0);
   if (err)
-    {
-      unsigned int idx;
-
-      for (idx = 0; idx < ctx->fdt.size; idx++)
-	if (ctx->fdt.fds[idx].fd != -1)
-	  _gpgme_io_close (ctx->fdt.fds[idx].fd);
-      _gpgme_engine_io_event (ctx->engine, GPGME_EVENT_DONE, &err);
-    }
+    _gpgme_cancel_with_err (ctx, err);
   else
     {
       unsigned int i;