2005-12-31 Marcus Brinkmann <marcus@g10code.de>

	* w32-glib-io.c (find_channel): Set channel to unbuffered.
	(_gpgme_io_select): Fix debug output.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 3f6e99c90d9441d75bf392d226337ac93bc7120f..5030dd02e034472af570bcb62693d0269d2d1b77 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-31  Marcus Brinkmann  <marcus@g10code.de>
+
+       * w32-glib-io.c (find_channel): Set channel to unbuffered.
+       (_gpgme_io_select): Fix debug output.
+
 2005-12-20  Werner Koch  <wk@g10code.com>
 
        * gpgme.h (gpgme_status_code_t): Added GPGME_STATUS_PKA_TRUST_BAD

diff --git a/trunk/gpgme/w32-glib-io.c b/trunk/gpgme/w32-glib-io.c
index d83147c491c82d9dd5f43bc676ac095e38c02977..f725a06b9e920e04021633013110037288028ea6 100644 (file)
--- a/trunk/gpgme/w32-glib-io.c
+++ b/trunk/gpgme/w32-glib-io.c
@@ -81,8 +81,12 @@ find_channel (int fd, int create)
     return NULL;
 
   if (create && !giochannel_table[fd])
-    giochannel_table[fd] = g_io_channel_win32_new_fd (fd);
-      
+    {
+      giochannel_table[fd] = g_io_channel_win32_new_fd (fd);
+      g_io_channel_set_encoding (giochannel_table[fd], NULL, NULL);
+      g_io_channel_set_buffered (giochannel_table[fd], FALSE);
+    }
+
   return giochannel_table[fd];
 }
 
@@ -587,9 +591,11 @@ _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock)
       for (i = 0; i < npollfds; i++)
        {
          if ((pollfds[i].revents & G_IO_IN))
-           DEBUG_ADD1 (dbg_help, "r%d ", i);
+           DEBUG_ADD1 (dbg_help, "r%d ", fds[pollfds_map[i]].fd);
           if ((pollfds[i].revents & G_IO_OUT))
-            DEBUG_ADD1 (dbg_help, "w%d ", i);
+            DEBUG_ADD1 (dbg_help, "w%d ", fds[pollfds_map[i]].fd);
+         DEBUG_ADD2 (dbg_help, "x%d(%x) ", fds[pollfds_map[i]].fd,
+                     pollfds[i].revents);
         }
       DEBUG_END (dbg_help, "]");
     }