adium 4034:752cad0bbfca: Use 'Facebook' as the serviceID, and lo...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/752cad0bbfca
revision:	4034:752cad0bbfca
branch:		(none)
author:		Evan Schoenberg
date:		Mon Jun 27 17:03:04 2011 -0500

Use 'Facebook' as the serviceID, and lookup the service by unique ID as necessary. This allows existing service icon packs to continue to work. Fixes #15293
(transplanted from b34a397f8bf8432be2a2551b19f883213005683f)

diffs (24 lines):

diff -r 82094bea5eef -r 752cad0bbfca Plugins/Purple Service/AIFacebookXMPPService.m
--- a/Plugins/Purple Service/AIFacebookXMPPService.m	Mon Jun 27 14:25:05 2011 +0200
+++ b/Plugins/Purple Service/AIFacebookXMPPService.m	Mon Jun 27 17:03:04 2011 -0500
@@ -29,7 +29,7 @@
 }
 
 - (NSString *)serviceID{
-    return FACEBOOK_XMPP_SERVICE_ID;
+    return @"Facebook";
 }
 
 - (NSString *)serviceClass{
diff -r 82094bea5eef -r 752cad0bbfca Plugins/Purple Service/PurpleFacebookAccount.m
--- a/Plugins/Purple Service/PurpleFacebookAccount.m	Mon Jun 27 14:25:05 2011 +0200
+++ b/Plugins/Purple Service/PurpleFacebookAccount.m	Mon Jun 27 17:03:04 2011 -0500
@@ -43,7 +43,7 @@
 	
 	//Move logs to the new account
 	NSString *logsDir = [[adium.loginController userDirectory] stringByAppendingPathComponent:@"Logs"];
-	AIService *newXMPPService = [adium.accountController firstServiceWithServiceID:FACEBOOK_XMPP_SERVICE_ID];
+	AIService *newXMPPService = [adium.accountController serviceWithUniqueID:FACEBOOK_XMPP_SERVICE_ID];
 	
 	NSString *oldFolder = [NSString stringWithFormat:@"%@.%@",
 						   [self.migrationData objectForKey:@"originalServiceID"],