# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1193375237 0
# Node ID aed039f5360b85ea2f5f68c64d9b6ad58dbcc69c
# Parent  787b3897ba9f6e16107273c2f58c8e7f67ff9a9d# Parent  8b74b226e02325872648c4da76fb2655ceb2c86f
merge of '624a8a3a5fd07708e24e8238a0d745c857ca9c72'
     and '9d0fba0e0edc763a880b7b5261ae1023f340c97b'

diff -r 787b3897ba9f -r aed039f5360b libpurple/protocols/bonjour/jabber.c
--- a/libpurple/protocols/bonjour/jabber.c	Fri Oct 26 04:59:23 2007 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Fri Oct 26 05:07:17 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 787b3897ba9f -r aed039f5360b libpurple/protocols/bonjour/mdns_win32.c
--- a/libpurple/protocols/bonjour/mdns_win32.c	Fri Oct 26 04:59:23 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_win32.c	Fri Oct 26 05:07:17 2007 +0000
@@ -150,7 +150,6 @@
 	g_slist_free(hosts);
 
 	/* free the remaining args memory */
-	purple_dnsquery_destroy(args->query);
 	g_free(args->full_service_name);
 	g_free(args);
 }