# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1193338305 0
# Node ID c41fcc6973060f9e6bd89bfecadcd27324029c02
# Parent  ed4c4eecad90bbb8b13055488cd148b988eb8877# Parent  d55617a15301156068f4c776dbe6f89411b081e9
merge of '80428952b570d014e6a4014048edcf0bde18eebb'
     and 'c7c88ffd833bca4ab16f164907b32ea5dff2ae6a'

diff -r ed4c4eecad90 -r c41fcc697306 libpurple/protocols/bonjour/jabber.c
--- a/libpurple/protocols/bonjour/jabber.c	Thu Oct 25 04:43:01 2007 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Thu Oct 25 18:51:45 2007 +0000
@@ -375,12 +375,14 @@
 
 	/* Inform the user that the conversation has been closed */
 	if (bb->conversation != NULL) {
+#if 0
 		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);
 			purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL));
 			g_free(tmp);
 		}
+#endif
 		/* Close the socket, clear the watcher and free memory */
 		bonjour_jabber_close_conversation(bb->conversation);
 		bb->conversation = NULL;