2003-02-05 Marcus Brinkmann <marcus@g10code.de>

	* wait-user.c (_gpgme_wait_user_remove_io_cb): Move check for no
	I/O handlers left to ...
	(_gpgme_user_io_cb_handler): ... here.

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 78d2b46058e2e00a36ae21201af62b91d0db8448..be470eb9cebf78dc7d7fb8f18682921384078861 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-05  Marcus Brinkmann  <marcus@g10code.de>
+
+       * wait-user.c (_gpgme_wait_user_remove_io_cb): Move check for no
+       I/O handlers left to ...
+       (_gpgme_user_io_cb_handler): ... here.
+
 2003-02-04  Marcus Brinkmann  <marcus@g10code.de>
 
        * trustlist.c (trustlist_colon_handler): Release ITEM if name

diff --git a/gpgme/wait-user.c b/gpgme/wait-user.c
index e148491beebfa426e894682c6d6dd4cf0a43a720..02a6076714b17726950e543e72be453f5f74adb6 100644 (file)
--- a/gpgme/wait-user.c
+++ b/gpgme/wait-user.c
@@ -59,6 +59,16 @@ _gpgme_user_io_cb_handler (void *data, int fd)
          _gpgme_io_close (ctx->fdt.fds[idx].fd);
       _gpgme_engine_io_event (ctx->engine, GPGME_EVENT_DONE, &err);
     }
+  else
+    {
+      int i;
+
+      for (i = 0; i < ctx->fdt.size; i++)
+       if (ctx->fdt.fds[i].fd != -1)
+         break;
+      if (i == ctx->fdt.size)
+       _gpgme_engine_io_event (ctx->engine, GPGME_EVENT_DONE, &err);
+    }
   return 0;
 }
 
@@ -95,22 +105,12 @@ _gpgme_wait_user_remove_io_cb (void *data)
 {
   struct tag *tag = (struct tag *) data;
   GpgmeCtx ctx;
-  int i;
 
   assert (tag);
   ctx = tag->ctx;
 
   (*ctx->io_cbs.remove) (tag->user_tag);
   _gpgme_remove_io_cb (data);
-
-  for (i = 0; i < ctx->fdt.size; i++)
-    if (ctx->fdt.fds[i].fd != -1)
-      break;
-  if (i == ctx->fdt.size)
-    {
-      GpgmeError err = 0;
-      _gpgme_engine_io_event (ctx->engine, GPGME_EVENT_DONE, &err);
-    }
 }