aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2006-01-03 14:20:12 +0000
committerMarcus Brinkmann <[email protected]>2006-01-03 14:20:12 +0000
commit1fc25af357735bcc2436507db4589b221626f327 (patch)
tree890bd70d75d812afd3ec02193ba028a827fdbd1a
parentFix last change. (diff)
downloadgpgme-1fc25af357735bcc2436507db4589b221626f327.tar.gz
gpgme-1fc25af357735bcc2436507db4589b221626f327.zip
2006-01-03 Marcus Brinkmann <[email protected]>
* w32-glib-io.c (_gpgme_io_close): Only close fd if there is no channel for it.
Diffstat (limited to '')
-rw-r--r--gpgme/ChangeLog5
-rw-r--r--gpgme/w32-glib-io.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 5030dd02..3ca9302d 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-03 Marcus Brinkmann <[email protected]>
+
+ * w32-glib-io.c (_gpgme_io_close): Only close fd if there is no
+ channel for it.
+
2005-12-31 Marcus Brinkmann <[email protected]>
* w32-glib-io.c (find_channel): Set channel to unbuffered.
diff --git a/gpgme/w32-glib-io.c b/gpgme/w32-glib-io.c
index 5c116603..7dd57402 100644
--- a/gpgme/w32-glib-io.c
+++ b/gpgme/w32-glib-io.c
@@ -287,8 +287,8 @@ _gpgme_io_close (int fd)
g_io_channel_unref (chan);
giochannel_table[fd] = NULL;
}
-
- _close (fd);
+ else
+ _close (fd);
return 0;
}