pidgin: 7a7658e2: bonjour: Fix a crash-on-disconnect I int...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 7a7658e25ae8a63cd0217ec708ea03aa1fa88337
Ancestor: 43a327c9a14971ced853e5466ce234dd843aee29
Author: darkrain42 at pidgin.im
Date: 2010-05-13T21:01:34
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7a7658e25ae8a63cd0217ec708ea03aa1fa88337

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

ChangeLog: 

bonjour: Fix a crash-on-disconnect I introduced.  Closes #11851

-------------- next part --------------
============================================================
--- ChangeLog	91b6b0b3a8134f20308fd352c3df9c36916650f6
+++ ChangeLog	4725054aad9c9b909609793bfdd08d745fc67553
@@ -1,6 +1,9 @@ version 2.7.1 (??/??/????):
 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.
============================================================
--- libpurple/protocols/bonjour/jabber.c	185a787115d9f3df247fb006aa21643dd727aa2b
+++ libpurple/protocols/bonjour/jabber.c	88333cc283c7bd6f1a47ada9100ea28108622200
@@ -1184,7 +1184,7 @@ bonjour_jabber_stop(BonjourJabber *jdata
 		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;