[svn] gpgme - r1147 - trunk/gpgme

[svn author marcus]

Author: marcus
Date: 2006-01-03 15:20:12 +0100 (Tue, 03 Jan 2006)
New Revision: 1147

Modified:
   trunk/gpgme/ChangeLog
   trunk/gpgme/w32-glib-io.c
Log:
2006-01-03  Marcus Brinkmann  <marcus at g10code.de>

	* w32-glib-io.c (_gpgme_io_close): Only close fd if there is no
	channel for it.


Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog	2005-12-31 12:56:49 UTC (rev 1146)
+++ trunk/gpgme/ChangeLog	2006-01-03 14:20:12 UTC (rev 1147)
@@ -1,3 +1,8 @@
+2006-01-03  Marcus Brinkmann  <marcus at g10code.de>
+
+	* w32-glib-io.c (_gpgme_io_close): Only close fd if there is no
+	channel for it.
+
 2005-12-31  Marcus Brinkmann  <marcus at g10code.de>
 
 	* w32-glib-io.c (find_channel): Set channel to unbuffered.

Modified: trunk/gpgme/w32-glib-io.c
===================================================================
--- trunk/gpgme/w32-glib-io.c	2005-12-31 12:56:49 UTC (rev 1146)
+++ trunk/gpgme/w32-glib-io.c	2006-01-03 14:20:12 UTC (rev 1147)
@@ -287,9 +287,9 @@
       g_io_channel_unref (chan);
       giochannel_table[fd] = NULL;
     }
+  else
+    _close (fd);
 
-  _close (fd);
-
   return 0;
 }