# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1255037478 0
# Node ID 203839bc0f7c1892c0403761f9df1ba5b72594a0
# Parent  c4fa41bb1672b339dfaf38b668f4e2078084e87d
Fix a leak, and a series of typos.

diff -r c4fa41bb1672 -r 203839bc0f7c libpurple/protocols/msn/contact.c
--- a/libpurple/protocols/msn/contact.c	Thu Oct 08 19:15:31 2009 +0000
+++ b/libpurple/protocols/msn/contact.c	Thu Oct 08 21:31:18 2009 +0000
@@ -206,6 +206,7 @@
 		                   "Operation {%s} failed. No response received from server.\n",
 		                   msn_contact_operation_str(state->action));
 		msn_session_set_error(state->session, MSN_ERROR_BAD_BLIST, NULL);
+		msn_callback_state_free(state);
 		return;
 	}
 
diff -r c4fa41bb1672 -r 203839bc0f7c libpurple/protocols/msn/oim.c
--- a/libpurple/protocols/msn/oim.c	Thu Oct 08 19:15:31 2009 +0000
+++ b/libpurple/protocols/msn/oim.c	Thu Oct 08 21:31:18 2009 +0000
@@ -481,6 +481,7 @@
 
 	g_free(msg_body);
 	g_free(soap_body);
+	msn_oim_free_send_req(oim_request);
 }
 
 /****************************************
diff -r c4fa41bb1672 -r 203839bc0f7c libpurple/protocols/msn/servconn.c
--- a/libpurple/protocols/msn/servconn.c	Thu Oct 08 19:15:31 2009 +0000
+++ b/libpurple/protocols/msn/servconn.c	Thu Oct 08 21:31:18 2009 +0000
@@ -86,7 +86,7 @@
 	if (servconn->tx_handler > 0)
 		purple_input_remove(servconn->tx_handler);
 	if (servconn->timeout_handle > 0)
-		purple_input_remove(servconn->timeout_handle);
+		purple_timeout_remove(servconn->timeout_handle);
 
 	msn_cmdproc_destroy(servconn->cmdproc);
 	g_free(servconn);
@@ -280,7 +280,7 @@
 
 	if (servconn->timeout_handle > 0)
 	{
-		purple_input_remove(servconn->timeout_handle);
+		purple_timeout_remove(servconn->timeout_handle);
 		servconn->timeout_handle = 0;
 	}
 
@@ -300,7 +300,7 @@
 servconn_idle_timeout_cb(MsnServConn *servconn)
 {
 	msn_servconn_disconnect(servconn);
-	servconn->timeout_handle = 0;
+	servconn->timeout_handle = 0;	/* XXX: servconn may not be valid anymore */
 	return FALSE;
 }
 
@@ -308,7 +308,7 @@
 servconn_timeout_renew(MsnServConn *servconn)
 {
 	if (servconn->timeout_handle) {
-		purple_input_remove(servconn->timeout_handle);
+		purple_timeout_remove(servconn->timeout_handle);
 		servconn->timeout_handle = 0;
 	}