diff options
| author | Marcus Brinkmann <[email protected]> | 2005-12-31 04:22:14 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2005-12-31 04:22:14 +0000 |
| commit | 5b90f5cfcb17c959cca662064941ec46e27062e4 (patch) | |
| tree | 591c25bccc980eef6889195ddaa5498b903c834f | |
| parent | Basic PKA support. (diff) | |
| download | gpgme-5b90f5cfcb17c959cca662064941ec46e27062e4.tar.gz gpgme-5b90f5cfcb17c959cca662064941ec46e27062e4.zip | |
2005-12-31 Marcus Brinkmann <[email protected]>
* w32-glib-io.c (find_channel): Set channel to unbuffered.
(_gpgme_io_select): Fix debug output.
Diffstat (limited to '')
| -rw-r--r-- | gpgme/ChangeLog | 5 | ||||
| -rw-r--r-- | gpgme/w32-glib-io.c | 14 |
2 files changed, 15 insertions, 4 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 3f6e99c9..5030dd02 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2005-12-31 Marcus Brinkmann <[email protected]> + + * w32-glib-io.c (find_channel): Set channel to unbuffered. + (_gpgme_io_select): Fix debug output. + 2005-12-20 Werner Koch <[email protected]> * gpgme.h (gpgme_status_code_t): Added GPGME_STATUS_PKA_TRUST_BAD diff --git a/gpgme/w32-glib-io.c b/gpgme/w32-glib-io.c index d83147c4..f725a06b 100644 --- a/gpgme/w32-glib-io.c +++ b/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, "]"); } |