adium 5869:49a5b63485c5: Inform the user about what's happening ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/49a5b63485c5
revision:	5869:49a5b63485c5
branch:		adium-1.6
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Mon May 05 18:45:15 2014 +0200

Inform the user about what's happening during SMP negotiation.
Subject: adium 5870:604bcdb5ff17: Disconnect all instances when Adium is shutting down, not just the most recent one.

details:	http://hg.adium.im/adium/rev/604bcdb5ff17
revision:	5870:604bcdb5ff17
branch:		adium-1.6
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Mon May 05 18:45:49 2014 +0200

Disconnect all instances when Adium is shutting down, not just the most recent one.

diffs (60 lines):

diff -r 792242009240 -r 604bcdb5ff17 Source/AdiumOTREncryption.m
--- a/Source/AdiumOTREncryption.m	Mon May 05 18:43:55 2014 +0200
+++ b/Source/AdiumOTREncryption.m	Mon May 05 18:45:49 2014 +0200
@@ -959,12 +959,17 @@
 															  initWithQuestion:@""
 															  from:inChat.listObject
 															  completionHandler:^(NSData *answer, NSString *question) {
-		otrl_message_initiate_smp_q(otrg_get_userstate(),
-									&ui_ops, NULL, context,
-									(const char *)[question UTF8String],
-									[answer bytes],
-									[answer length]);
-	}
+																  
+																  otrl_message_initiate_smp_q(otrg_get_userstate(),
+																							  &ui_ops, NULL, context,
+																							  (const char *)[question UTF8String],
+																							  [answer bytes],
+																							  [answer length]);
+																  
+																  [adium.contentController displayEvent:[NSString stringWithFormat:AILocalizedString(@"You have asked %@ a secret question to verify their identity. Awaiting answer...", nil), inChat.listObject.displayName]
+																								 ofType:@"encryption"
+																								 inChat:inChat];
+															  }
 															  isInitiator:TRUE];
 	
 	[windowController showWindow:nil];
@@ -980,11 +985,16 @@
 	AIOTRSMPSharedSecretWindowController *windowController = [[AIOTRSMPSharedSecretWindowController alloc]
 															  initFrom:inChat.listObject
 															  completionHandler:^(NSData *answer) {
-		otrl_message_initiate_smp(otrg_get_userstate(),
-								  &ui_ops, NULL,
-								  context,
-								  [answer bytes],
-								  [answer length]);
+																  
+																  otrl_message_initiate_smp(otrg_get_userstate(),
+																							&ui_ops, NULL,
+																							context,
+																							[answer bytes],
+																							[answer length]);
+																  
+																  [adium.contentController displayEvent:[NSString stringWithFormat:AILocalizedString(@"You have asked %@ to compare your shared secret to verify their identity. Awaiting answer...", nil), inChat.listObject.displayName]
+																								 ofType:@"encryption"
+																								 inChat:inChat];
 	}
 															  isInitiator:TRUE];
 	
@@ -1108,8 +1118,8 @@
 void
 disconnect_from_context(ConnContext *context)
 {
-    otrl_message_disconnect(otrg_plugin_userstate, &ui_ops, NULL,
-							context->accountname, context->protocol, context->username, OTRL_INSTAG_RECENT);
+    otrl_message_disconnect_all_instances(otrg_plugin_userstate, &ui_ops, NULL,
+							context->accountname, context->protocol, context->username);
 	gone_insecure_cb(NULL, context);
 }