# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1273784494 0
# Node ID 55913ed2a229ea0f3237ea0c250fb8a8f0b75288
# Parent  d24cbd2c1e211b4832b9c86c855987f943f8907a
bonjour: Fix a crash-on-disconnect I introduced.  Closes #11851

diff -r d24cbd2c1e21 -r 55913ed2a229 ChangeLog
--- a/ChangeLog	Thu May 13 13:29:24 2010 +0000
+++ b/ChangeLog	Thu May 13 21:01:34 2010 +0000
@@ -1,6 +1,9 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.7.1 (??/??/????):
+	Bonjour:
+	* Fix a crash on disconnect.
+
 	MSN:
 	* Fix unnecessary bandwidth consumption for buddy icon requests when
 	  buddies have capital letters in their passport addresses.
diff -r d24cbd2c1e21 -r 55913ed2a229 libpurple/protocols/bonjour/jabber.c
--- a/libpurple/protocols/bonjour/jabber.c	Thu May 13 13:29:24 2010 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Thu May 13 21:01:34 2010 +0000
@@ -1184,7 +1184,7 @@
 		buddies = purple_find_buddies(jdata->account, NULL);
 		for (l = buddies; l; l = l->next) {
 			BonjourBuddy *bb = purple_buddy_get_protocol_data((PurpleBuddy*) l->data);
-			if (bb != NULL) {
+			if (bb && bb->conversation) {
 				/* Any ongoing connection attempt is cancelled
 				 * by _purple_connection_destroy */
 				bb->conversation->connect_data = NULL;