pidgin: 0818f226: Fix a leak, and a series of typos.

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 0818f22621a06fa5a61bba3d4a10de1e42813cfa
Ancestor: f7cc3ea0dcdf510d8274ac962fdce0573b922192
Author: sadrul at pidgin.im
Date: 2009-10-08T21:31:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0818f22621a06fa5a61bba3d4a10de1e42813cfa

Modified files:
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/servconn.c

ChangeLog: 

Fix a leak, and a series of typos.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/contact.c	98eb479e1b4f7fc7bc4d25ad6055c18809bdcf8f
+++ libpurple/protocols/msn/contact.c	6dc1144d5694f2c5095fc1804cdc9de2c70bfe3f
@@ -206,6 +206,7 @@ msn_contact_request_cb(MsnSoapMessage *r
 		                   "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;
 	}
 
============================================================
--- libpurple/protocols/msn/oim.c	8a9f9d40c54e09eaacc49c0dc048be5c59ce6497
+++ libpurple/protocols/msn/oim.c	c32d2d1dadeb42829ec5dedc648ec23147ac4af3
@@ -481,6 +481,7 @@ msn_oim_send_msg(MsnOim *oim)
 
 	g_free(msg_body);
 	g_free(soap_body);
+	msn_oim_free_send_req(oim_request);
 }
 
 /****************************************
============================================================
--- libpurple/protocols/msn/servconn.c	3af0658d2cedf5ddfd0410fb00a432bf41b0e5b9
+++ libpurple/protocols/msn/servconn.c	80d4f276f107098c40472d51670f6785a20178fb
@@ -86,7 +86,7 @@ msn_servconn_destroy(MsnServConn *servco
 	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 @@ msn_servconn_disconnect(MsnServConn *ser
 
 	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 *se
 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 *serv
 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;
 	}