2005-05-05 Mikael Hallendal <micke@imendio.com>

	* loudmouth/lm-connection.c: (connection_free):
	- Unref LmSSL when freeing connection. Reported by Daniel Lavalliere.
	- Fixes LM-4.

diff --git a/ChangeLog b/ChangeLog
index b7b93781116d4eff0a3179431629ba8c62e5a013..213b88e041d001b1e17ece5083c8c2acce73fcd1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-05  Mikael Hallendal  <micke@imendio.com>
+
+       * loudmouth/lm-connection.c: (connection_free):
+       - Unref LmSSL when freeing connection. Reported by Daniel Lavalliere.
+       - Fixes LM-4.
+
 2005-04-24  Mikael Hallendal  <micke@imendio.com>
 
        * loudmouth/lm-connection.c: (connection_free):

diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c
index 01b1a69b3000c835ceb08edef6f4830a9423f6f7..b6ce298bc0acde397f8014e4a9c0931f62c1fcb6 100644 (file)
--- a/loudmouth/lm-connection.c
+++ b/loudmouth/lm-connection.c
@@ -212,6 +212,10 @@ connection_free (LmConnection *connection)
                lm_message_unref (m);
        }
 
+       if (connection->ssl) {
+               lm_ssl_unref (connection->ssl);
+       }
+
        g_queue_free (connection->incoming_messages);
        g_free (connection);
 }
@@ -324,9 +328,13 @@ _lm_connection_succeeded (LmConnectData *connect_data)
                                    NULL)) {
                        shutdown (connection->fd, SHUT_RDWR);
                        close (connection->fd);
+               
                        connection_do_close (connection);
                        connection->fd = -1;
+                       
                        g_io_channel_unref(connection->io_channel);
+                       connection->io_channel = NULL;
+                       
                        return FALSE;
                }
        }