adium 5784:67f32018b210: Make sure OTR to Pidgin using Bonjour w...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/67f32018b210
revision:	5784:67f32018b210
branch:		libotr4.0.0
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Thu Dec 05 18:06:17 2013 +0100

Make sure OTR to Pidgin using Bonjour works, now really fixes #16445. It seems Pidgin ignores messages on Bonjour that do not include a plain text representation. This seems wrong, but to work around it, Adium now always sends a plain and a formatted version of each message (when using OTR, these are identical).

Also, fix a possible crash when an Bonjour connection unexpectedly closes.

diffs (23 lines):

diff -r bc1c0ee04a3e -r 67f32018b210 Plugins/Bonjour/AWBonjourAccount.m
--- a/Plugins/Bonjour/AWBonjourAccount.m	Sun Nov 24 16:52:24 2013 +0100
+++ b/Plugins/Bonjour/AWBonjourAccount.m	Thu Dec 05 18:06:17 2013 +0100
@@ -326,7 +326,7 @@
 
 - (BOOL)sendMessageObject:(AIContentMessage *)inContentMessage
 {
-	[libezv sendMessage:inContentMessage.messageString
+	[libezv sendMessage:[[AIHTMLDecoder decodeHTML:inContentMessage.encodedMessage] string]
 					 to:inContentMessage.destination.UID
 			   withHtml:inContentMessage.encodedMessage];
 	
diff -r bc1c0ee04a3e -r 67f32018b210 Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.m	Sun Nov 24 16:52:24 2013 +0100
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.m	Thu Dec 05 18:06:17 2013 +0100
@@ -142,6 +142,7 @@
            [[aNotification object] autorelease];
         connection = nil;
         [delegate XMLConnectionClosed];
+		return;
     }
     
     NSAssert( UINT_MAX >= [data length], @"Received too much data to parse" );