adium 5644:581512963e6c: Rename the OTR settings to make clearer...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/581512963e6c
revision:	5644:581512963e6c
branch:		libotr4.0.0
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Tue Jul 09 19:00:33 2013 +0200

Rename the OTR settings to make clearer what their difference is:

"Encrypt chats as requested" -> "Allow chat encryption"
"Encrypt chats automatically" -> "Use chat encryption when available"
Subject: adium 5645:a1d6eedadab9: Lets not even prompt when the user gets a new unverified fingerprint. They shouldn't accept it blindly, they should use SMP.

details:	http://hg.adium.im/adium/rev/a1d6eedadab9
revision:	5645:a1d6eedadab9
branch:		libotr4.0.0
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Tue Jul 09 19:01:42 2013 +0200

Lets not even prompt when the user gets a new unverified fingerprint. They shouldn't accept it blindly, they should use SMP.

diffs (67 lines):

diff -r 59de9d0009e1 -r a1d6eedadab9 Source/AIContentController.m
--- a/Source/AIContentController.m	Wed Jun 19 19:03:11 2013 +0200
+++ b/Source/AIContentController.m	Tue Jul 09 19:01:42 2013 +0200
@@ -872,7 +872,7 @@
 	[encryptionMenu addItem:menuItem];
 	[menuItem release];
 	
-	menuItem = [[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Encrypt chats as requested",nil)
+	menuItem = [[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Allow chat encryption",nil)
 										  target:target
 										  action:@selector(selectedEncryptionPreference:)
 								   keyEquivalent:@""];
@@ -881,7 +881,7 @@
 	[encryptionMenu addItem:menuItem];
 	[menuItem release];
 	
-	menuItem = [[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Encrypt chats automatically",nil)
+	menuItem = [[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Use chat encryption when available",nil)
 										  target:target
 										  action:@selector(selectedEncryptionPreference:)
 								   keyEquivalent:@""];
diff -r 59de9d0009e1 -r a1d6eedadab9 Source/AdiumOTREncryption.m
--- a/Source/AdiumOTREncryption.m	Wed Jun 19 19:03:11 2013 +0200
+++ b/Source/AdiumOTREncryption.m	Tue Jul 09 19:01:42 2013 +0200
@@ -46,8 +46,6 @@
 #define STORE_PATH	 [[[adium.loginController userDirectory] stringByAppendingPathComponent:@"otr.fingerprints"] UTF8String]
 #define INSTAG_PATH [[[adium.loginController userDirectory] stringByAppendingPathComponent:@"otr.instag"] UTF8String]
 
-#define CLOSED_CONNECTION_MESSAGE "has closed his private connection to you"
-
 /* OTRL_POLICY_MANUAL doesn't let us respond to other users' automatic attempts at encryption.
 * If either user has OTR set to Automatic, an OTR session should be begun; without this modified
 * mask, both users would have to be on automatic for OTR to begin automatically, even though one user
@@ -67,7 +65,6 @@
 - (void)adiumFinishedLaunching:(NSNotification *)inNotification;
 - (void)adiumWillTerminate:(NSNotification *)inNotification;
 - (void)updateSecurityDetails:(NSNotification *)inNotification;
-- (void)verifyUnknownFingerprint:(NSValue *)contextValue;
 @end
 
 @implementation AdiumOTREncryption
@@ -509,9 +506,6 @@
 		return;
 	}
 	
-	[adiumOTREncryption performSelector:@selector(verifyUnknownFingerprint:)
-							 withObject:[NSValue valueWithPointer:context]
-							 afterDelay:0];
 	[pool release];
 }
 
@@ -1120,15 +1114,6 @@
 
 #pragma mark -
 
-- (void)verifyUnknownFingerprint:(NSValue *)contextValue
-{
-	NSDictionary		*responseInfo;
-	
-	responseInfo = details_for_context([contextValue pointerValue]);
-	
-	[ESOTRUnknownFingerprintController showUnknownFingerprintPromptWithResponseInfo:responseInfo];
-}
-
 /*!
  * @brief Call this function when our DSA key is updated; it will redraw the Encryption preferences item, if visible.
  */