adium 4435:1416b18cc35a: Google Plus allows you to add people to...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/1416b18cc35a
revision:	4435:1416b18cc35a
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Dec 26 20:17:38 2011 +0100

Google Plus allows you to add people to your GTalk contact list without having
to reveal their email. These people show up as
(randomstring)@public.talk.google.com. Show these people as GTalk users instead
of generic Jabber users too.

diffs (39 lines):

diff -r 4c0fee2504ef -r 1416b18cc35a Frameworks/Adium Framework/Source/AIAddressBookController.m
--- a/Frameworks/Adium Framework/Source/AIAddressBookController.m	Fri Dec 23 16:21:31 2011 -0500
+++ b/Frameworks/Adium Framework/Source/AIAddressBookController.m	Mon Dec 26 20:17:38 2011 +0100
@@ -1085,7 +1085,8 @@
 	NSString	*serviceID;
 
 	if ([UID hasSuffix:@"@gmail.com"] ||
-		[UID hasSuffix:@"@googlemail.com"]) {
+		[UID hasSuffix:@"@googlemail.com"] ||
+        [UID hasSuffix:@"@public.talk.google.com"]) {
 		serviceID = @"GTalk";
 	} else if ([UID hasSuffix:@"@livejournal.com"]) {
 		serviceID = @"LiveJournal";
diff -r 4c0fee2504ef -r 1416b18cc35a Plugins/Purple Service/ESPurpleJabberAccount.m
--- a/Plugins/Purple Service/ESPurpleJabberAccount.m	Fri Dec 23 16:21:31 2011 -0500
+++ b/Plugins/Purple Service/ESPurpleJabberAccount.m	Mon Dec 26 20:17:38 2011 +0100
@@ -304,7 +304,8 @@
 	NSString	*contactServiceID = nil;
 
 	if ([contactUID hasSuffix:@"@gmail.com"] ||
-		[contactUID hasSuffix:@"@googlemail.com"]) {
+		[contactUID hasSuffix:@"@googlemail.com"] ||
+        [contactUID hasSuffix:@"@public.talk.google.com"]) {
 		contactServiceID = @"libpurple-jabber-gtalk";
 
 	} else if([contactUID hasSuffix:@"@livejournal.com"]){
diff -r 4c0fee2504ef -r 1416b18cc35a Source/AILogViewerWindowController.m
--- a/Source/AILogViewerWindowController.m	Fri Dec 23 16:21:31 2011 -0500
+++ b/Source/AILogViewerWindowController.m	Mon Dec 26 20:17:38 2011 +0100
@@ -2892,7 +2892,8 @@
 		[serviceClass isEqualToString:@"LiveJournal"]) {
 		
 		if ([contactUID hasSuffix:@"@gmail.com"] ||
-			[contactUID hasSuffix:@"@googlemail.com"]) {
+			[contactUID hasSuffix:@"@googlemail.com"] ||
+            [contactUID hasSuffix:@"@public.talk.google.com"]) {
 			serviceClass = @"GTalk";
 			
 		} else if ([contactUID hasSuffix:@"@livejournal.com"]){