# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1193376254 0
# Node ID f710e48fbe1b57fa5c0f6f33800343a5a53352b3
# Parent  abd768f06e7bcbf7cf5cc0d7a7edbb4f08b694fe# Parent  f119cd1cb47cd52392404dbaa4ef57432dd1124c
merge of '5d1f7fb3ad5d13827b161c3d115fb82e9826fe2c'
     and 'd275feb891040092b840d7cc48797e0a16e8a757'

diff -r abd768f06e7b -r f710e48fbe1b libpurple/protocols/bonjour/jabber.c
--- a/libpurple/protocols/bonjour/jabber.c	Fri Oct 26 05:22:26 2007 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Fri Oct 26 05:24:14 2007 +0000
@@ -367,7 +367,6 @@
 
 void bonjour_jabber_stream_ended(PurpleBuddy *pb) {
 	BonjourBuddy *bb = pb->proto_data;
-	PurpleConversation *conv;
 
 	purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", pb->name);
 
@@ -376,6 +375,7 @@
 	/* Inform the user that the conversation has been closed */
 	if (bb->conversation != NULL) {
 #if 0
+		PurpleConversation *conv;
 		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, pb->name, pb->account);
 		if (conv != NULL) {
 			char *tmp = g_strdup_printf(_("%s has closed the conversation."), pb->name);
diff -r abd768f06e7b -r f710e48fbe1b libpurple/protocols/bonjour/mdns_win32.c
--- a/libpurple/protocols/bonjour/mdns_win32.c	Fri Oct 26 05:22:26 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_win32.c	Fri Oct 26 05:24:14 2007 +0000
@@ -147,10 +147,13 @@
 	}
 
 	/* free the hosts list*/
-	g_slist_free(hosts);
+	while (hosts != NULL) {
+		hosts = g_slist_remove(hosts, hosts->data);
+		g_free(hosts->data);
+		hosts = g_slist_remove(hosts, hosts->data);
+	}
 
 	/* free the remaining args memory */
-	purple_dnsquery_destroy(args->query);
 	g_free(args->full_service_name);
 	g_free(args);
 }