2005-05-05 Mikael Hallendal <micke@imendio.com>
authorhallski <hallski>
Thu, 05 May 2005 19:12:31 +0000
changeset 118 3bb6f6410dd4
parent 117 5f6f1f273d6a
child 119 52273c5d05b6
2005-05-05 Mikael Hallendal <micke@imendio.com> * loudmouth/lm-connection.c: (_lm_connection_succeeded): - Don't unref io_channel here as well, already done in do_close. - Fixes LM-5, reported by Daniel Lavalliere. (connection_do_close): - Set fd to -1 to be sure it's not used again.
ChangeLog
loudmouth/lm-connection.c
--- a/ChangeLog	Thu May 05 19:07:15 2005 +0000
+++ b/ChangeLog	Thu May 05 19:12:31 2005 +0000
@@ -1,3 +1,12 @@
+2005-05-05  Mikael Hallendal  <micke@imendio.com>
+
+	* loudmouth/lm-connection.c: 
+	(_lm_connection_succeeded):
+	- Don't unref io_channel here as well, already done in do_close.
+	- Fixes LM-5, reported by Daniel Lavalliere.
+	(connection_do_close):
+	- Set fd to -1 to be sure it's not used again.
+
 2005-05-05  Mikael Hallendal  <micke@imendio.com>
 
 	* loudmouth/lm-ssl.c: (_lm_ssl_read):
--- a/loudmouth/lm-connection.c	Thu May 05 19:07:15 2005 +0000
+++ b/loudmouth/lm-connection.c	Thu May 05 19:12:31 2005 +0000
@@ -330,11 +330,6 @@
 			close (connection->fd);
 		
 			connection_do_close (connection);
-			connection->fd = -1;
-			
-			g_io_channel_unref(connection->io_channel);
-			connection->io_channel = NULL;
-			
 			return FALSE;
 		}
 	}
@@ -710,6 +705,8 @@
 
 		g_io_channel_unref (connection->io_channel);
 		connection->io_channel = NULL;
+
+		connection->fd = -1;
 	}