adium 3916:28489468e04c: Patch from "Camillo" which removes the ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/28489468e04c
revision:	3916:28489468e04c
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Thu May 26 12:29:15 2011 +0200

Patch from "Camillo" which removes the no longer necessary workaround when verifying the identify of Google Talk servers.

Fixes #14891

diffs (25 lines):

diff -r 059db58988ca -r 28489468e04c Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.m
--- a/Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.m	Wed May 25 09:18:05 2011 +0200
+++ b/Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.m	Thu May 26 12:29:15 2011 +0200
@@ -51,21 +51,6 @@
 							 resultCallback:(void (*)(gboolean trusted, void *userdata))_query_cert_cb
 								   userData:(void*)ud
 {
-	if ([hostname caseInsensitiveCompare:@"talk.google.com"] == NSOrderedSame) {
-		NSString *UID = account.UID;
-		NSRange startOfDomain = [UID rangeOfString:@"@"];
-		if (startOfDomain.location == NSNotFound ||
-			([[UID substringFromIndex:NSMaxRange(startOfDomain)] caseInsensitiveCompare:@"gmail.com"] == NSOrderedSame)) {
-			/* Google Talk accounts end up with a cert signed using gmail.com as the server.
-			 * However, Google For Domains accounts are signed using talk.google.com.
-			 */
-			hostname = @"gmail.com";
-		} else if ([[UID substringFromIndex:NSMaxRange(startOfDomain)] caseInsensitiveCompare:@"googlemail.com"] == NSOrderedSame) {
-			/* There are three certificates, as far as I (am) know. Maybe we should ask Sean for confirmation. */
-			hostname = @"googlemail.com";
-		}
-	}
-
 	AIPurpleCertificateTrustWarningAlert *alert = [[self alloc] initWithAccount:account hostname:hostname certificates:certs resultCallback:_query_cert_cb userData:ud];
 	[alert showWindow:nil];
 	[alert release];