im.pidgin.pidgin: 9d0fba0e0edc763a880b7b5261ae1023f340c97b

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 9d0fba0e0edc763a880b7b5261ae1023f340c97b
Ancestor: 19bec5deed1655967fe013afd29ff92014aa1749
Author: datallah at pidgin.im
Date: 2007-10-26T04:52:56
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_win32.c

ChangeLog: 

Fix a double-free that was not fun to track down. Fixes #3688.

-------------- next part --------------
============================================================
--- libpurple/protocols/bonjour/jabber.c	f343e124cf29e4073fa948c19df7b9fdc26a4df7
+++ libpurple/protocols/bonjour/jabber.c	c8f885925e2466642b3e097d4ea2468b291f0086
@@ -367,7 +367,6 @@ void bonjour_jabber_stream_ended(PurpleB
 
 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 @@ void bonjour_jabber_stream_ended(PurpleB
 	/* 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);
============================================================
--- libpurple/protocols/bonjour/mdns_win32.c	6730940435f462ce704c44ed84d38ee2baafbd90
+++ libpurple/protocols/bonjour/mdns_win32.c	0dde61385eccccabb364f15a0f51fa7b69a4537d
@@ -150,7 +150,6 @@ _mdns_resolve_host_callback(GSList *host
 	g_slist_free(hosts);
 
 	/* free the remaining args memory */
-	purple_dnsquery_destroy(args->query);
 	g_free(args->full_service_name);
 	g_free(args);
 }