# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1216272407 0
# Node ID aade89b067621d9c3da95ae40e712a1b6f729d7b
# Parent  ab70eae012f5abe1f3ca431477ef5db1ecba0a50# Parent  3ba2cddc49f0f27920fb2591817999762d224f2b
merge of '5e33eda76b698c04377f5ad6cdd3ad1ec87d2eff'
     and 'e935afc929a5049cfa89072e6e9dd8e3ab0afa54'

diff -r ab70eae012f5 -r aade89b06762 libpurple/cipher.c
--- a/libpurple/cipher.c	Thu Jul 17 05:25:48 2008 +0000
+++ b/libpurple/cipher.c	Thu Jul 17 05:26:47 2008 +0000
@@ -2402,7 +2402,6 @@
 	g_return_val_if_fail(context, FALSE);
 
 	cipher = context->cipher;
-	g_return_val_if_fail(context, FALSE);
 
 	if(cipher->ops && cipher->ops->digest)
 		return cipher->ops->digest(context, in_len, digest, out_len);
diff -r ab70eae012f5 -r aade89b06762 libpurple/protocols/bonjour/bonjour_ft.c
--- a/libpurple/protocols/bonjour/bonjour_ft.c	Thu Jul 17 05:25:48 2008 +0000
+++ b/libpurple/protocols/bonjour/bonjour_ft.c	Thu Jul 17 05:26:47 2008 +0000
@@ -300,6 +300,8 @@
 		}
 		if (xf->proxy_connection != NULL)
 			purple_proxy_connect_cancel(xf->proxy_connection);
+		if (xf->proxy_info != NULL)
+			purple_proxy_info_destroy(xf->proxy_info);
 		if (xf->listen_data != NULL)
 			purple_network_listen_cancel(xf->listen_data);
 		g_free(xf->iq_id);
@@ -802,6 +804,8 @@
 	xmlnode *q_node, *tmp_node;
 	BonjourData *bd;
 
+	xf->proxy_connection = NULL;
+
 	if(source < 0) {
 		purple_debug_error("bonjour", "Error connecting via SOCKS5 - %s\n",
 			error_message ? error_message : "(null)");
@@ -815,9 +819,6 @@
 
 	bd = xf->data;
 
-	purple_proxy_info_destroy(xf->proxy_info);
-	xf->proxy_connection = NULL;
-	xf->proxy_info = NULL;
 	/* Here, start the file transfer.*/
 
 	/* Notify Initiator of Connection */
@@ -871,8 +872,6 @@
 		xep_ft_si_reject(xf->data, xf->iq_id, xfer->who, "404", "cancel");
 		/* Cancel the connection */
 		purple_xfer_cancel_local(xfer);
-		/*purple_proxy_info_destroy(xf->proxy_info);
-		xf->proxy_info = NULL;*/
 	}
 }
 
diff -r ab70eae012f5 -r aade89b06762 libpurple/protocols/msn/msn.c
diff -r ab70eae012f5 -r aade89b06762 libpurple/protocols/msn/slpsession.c
--- a/libpurple/protocols/msn/slpsession.c	Thu Jul 17 05:25:48 2008 +0000
+++ b/libpurple/protocols/msn/slpsession.c	Thu Jul 17 05:26:47 2008 +0000
@@ -38,7 +38,6 @@
 
 	slpsession->slpcall = slpcall;
 	slpsession->id = slpcall->session_id;
-	slpsession->call_id = slpcall->id;
 	slpsession->app_id = slpcall->app_id;
 
 	slpcall->slplink->slp_sessions =
@@ -52,9 +51,6 @@
 {
 	g_return_if_fail(slpsession != NULL);
 
-	if (slpsession->call_id != NULL)
-		g_free(slpsession->call_id);
-
 	slpsession->slpcall->slplink->slp_sessions =
 		g_list_remove(slpsession->slpcall->slplink->slp_sessions, slpsession);
 
diff -r ab70eae012f5 -r aade89b06762 libpurple/protocols/msn/slpsession.h
--- a/libpurple/protocols/msn/slpsession.h	Thu Jul 17 05:25:48 2008 +0000
+++ b/libpurple/protocols/msn/slpsession.h	Thu Jul 17 05:26:47 2008 +0000
@@ -38,7 +38,6 @@
 	long id;
 
 	long app_id;
-	char *call_id;
 };
 
 MsnSlpSession *msn_slp_session_new(MsnSlpCall *slpcall);