adium 5139:2eaf7c88a06d: Send messages to the most recently acti...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/2eaf7c88a06d
revision:	5139:2eaf7c88a06d
branch:		libotr4.0.0
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Thu Oct 18 01:30:08 2012 +0200

Send messages to the most recently active instance, not the best. Hopefully this matches the multi-resource behaviour of libpurple/the server.

diffs (39 lines):

diff -r 62390297acd9 -r 2eaf7c88a06d Source/AdiumOTREncryption.m
--- a/Source/AdiumOTREncryption.m	Thu Oct 18 01:21:45 2012 +0200
+++ b/Source/AdiumOTREncryption.m	Thu Oct 18 01:30:08 2012 +0200
@@ -344,7 +344,7 @@
     username = [chat.listObject.UID UTF8String];
 	
     context = otrl_context_find(otrg_plugin_userstate,
-								username, accountname, proto, OTRL_INSTAG_BEST, 0, NULL,
+								username, accountname, proto, OTRL_INSTAG_RECENT, 0, NULL,
 								NULL, NULL);
 	
 	return context;
@@ -488,7 +488,7 @@
 	ConnContext			*context;
 	
 	context = otrl_context_find(us, username, accountname,
-								protocol, OTRL_INSTAG_BEST, 0, NULL, NULL, NULL);
+								protocol, OTRL_INSTAG_RECENT, 0, NULL, NULL, NULL);
 	
 	if (context == NULL/* || context->msgstate != OTRL_MSGSTATE_ENCRYPTED*/) {
 		NSLog(@"otrg_adium_dialog_unknown_fingerprint: Ack!");
@@ -812,7 +812,7 @@
 	ConnContext		*context = contextForChat(inContentMessage.chat);
 	
     err = otrl_message_sending(otrg_plugin_userstate, &ui_ops, /* opData */ NULL,
-							   accountname, protocol, username, OTRL_INSTAG_BEST, originalMessage, /* tlvs */ NULL, &fullOutgoingMessage,
+							   accountname, protocol, username, OTRL_INSTAG_RECENT, originalMessage, /* tlvs */ NULL, &fullOutgoingMessage,
 							   OTRL_FRAGMENT_SEND_ALL_BUT_LAST, &context,
 							   /* add_appdata cb */NULL, /* appdata */ NULL);
 
@@ -1015,7 +1015,7 @@
 void disconnect_from_context(ConnContext *context)
 {
     otrl_message_disconnect(otrg_plugin_userstate, &ui_ops, NULL,
-							context->accountname, context->protocol, context->username, OTRL_INSTAG_BEST);
+							context->accountname, context->protocol, context->username, OTRL_INSTAG_RECENT);
 	gone_insecure_cb(NULL, context);
 }