Mercurial > pidgin.yaz

changeset 21017:8b74b226e023

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a double-free that was not fun to track down. Fixes #3688.
author Daniel Atallah <daniel.atallah@gmail.com>
date Fri, 26 Oct 2007 04:52:56 +0000
parents 0314cb293463
children aed039f5360b
files libpurple/protocols/bonjour/jabber.c libpurple/protocols/bonjour/mdns_win32.c
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/bonjour/jabber.c	Fri Oct 26 00:13:18 2007 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Fri Oct 26 04:52:56 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);
--- a/libpurple/protocols/bonjour/mdns_win32.c	Fri Oct 26 00:13:18 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_win32.c	Fri Oct 26 04:52:56 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);
 }