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.

diff --git a/ChangeLog b/ChangeLog
index 444557716f39af99c2badd912359fbc21937dff3..cb18e1e3c862a75b6fabed5aa170ce9c5833799d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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):

diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c
index b6ce298bc0acde397f8014e4a9c0931f62c1fcb6..e3ff75f8262082ca7677d440e48552cb0ff8cc02 100644 (file)
--- a/loudmouth/lm-connection.c
+++ b/loudmouth/lm-connection.c
@@ -330,11 +330,6 @@ _lm_connection_succeeded (LmConnectData *connect_data)
                        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 @@ connection_do_close (LmConnection *connection)
 
                g_io_channel_unref (connection->io_channel);
                connection->io_channel = NULL;
+
+               connection->fd = -1;
        }