[svn] gpgme - r1145 - trunk/gpgme

[svn author marcus]

Author: marcus
Date: 2005-12-31 05:22:14 +0100 (Sat, 31 Dec 2005)
New Revision: 1145

Modified:
   trunk/gpgme/ChangeLog
   trunk/gpgme/w32-glib-io.c
Log:
2005-12-31  Marcus Brinkmann  <marcus at g10code.de>

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


Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog	2005-12-20 20:22:19 UTC (rev 1144)
+++ trunk/gpgme/ChangeLog	2005-12-31 04:22:14 UTC (rev 1145)
@@ -1,3 +1,8 @@
+2005-12-31  Marcus Brinkmann  <marcus at g10code.de>
+
+	* w32-glib-io.c (find_channel): Set channel to unbuffered.
+	(_gpgme_io_select): Fix debug output.
+
 2005-12-20  Werner Koch  <wk at g10code.com>
 
 	* gpgme.h (gpgme_status_code_t): Added GPGME_STATUS_PKA_TRUST_BAD

Modified: trunk/gpgme/w32-glib-io.c
===================================================================
--- trunk/gpgme/w32-glib-io.c	2005-12-20 20:22:19 UTC (rev 1144)
+++ trunk/gpgme/w32-glib-io.c	2005-12-31 04:22:14 UTC (rev 1145)
@@ -81,8 +81,12 @@
     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 @@
       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, "]");
     }