adium-1.4 3237:a90c80b9ff10: Tired of these warnings; we don't n...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/a90c80b9ff10
revision:	3237:a90c80b9ff10
author:		Evan Schoenberg
date:		Sat Nov 13 08:23:53 2010 -0600

Tired of these warnings; we don't need to be notified at every build.
Subject: adium-1.4 3238:80bc77e30a4d: Updated for new ICQ login server. Acccounts saved with the old server will automatically reset to the new default

details:	http://hg.adium.im/adium-1.4/rev/80bc77e30a4d
revision:	3238:80bc77e30a4d
author:		Evan Schoenberg
date:		Sat Nov 13 08:35:57 2010 -0600

Updated for new ICQ login server. Acccounts saved with the old server will automatically reset to the new default

diffs (76 lines):

diff -r 998a2971de8c -r 80bc77e30a4d Plugins/Purple Service/AMPurpleJabberServiceDiscoveryBrowserController.m
--- a/Plugins/Purple Service/AMPurpleJabberServiceDiscoveryBrowserController.m	Fri Nov 12 19:11:06 2010 -0600
+++ b/Plugins/Purple Service/AMPurpleJabberServiceDiscoveryBrowserController.m	Sat Nov 13 08:35:57 2010 -0600
@@ -83,7 +83,7 @@
 		
 		for (identity in identities) {
 			if ([[identity objectForKey:@"category"] isEqualToString:@"gateway"])
-#warning This should not be called outside libpurple!
+			/* XXX Using 'extern' declared function from jabber prpl */
 				jabber_register_gateway((JabberStream*)gc->proto_data, [[item jid] UTF8String]);
 			else if ([[identity objectForKey:@"category"] isEqualToString:@"conference"]) {
                 DCJoinChatWindowController *jcwc = [DCJoinChatWindowController showJoinChatWindow];
@@ -97,7 +97,7 @@
 					[(DCPurpleJabberJoinChatViewController*)[jcwc joinChatViewController] setRoomName:[[item jid] substringToIndex:atsign.location]];
 				}
 			} else if ([[identity objectForKey:@"category"] isEqualToString:@"directory"]) {
-#warning This should not be called outside libpurple!
+				/* XXX Using 'extern' declared function from jabber prpl */
 				jabber_user_search((JabberStream*)gc->proto_data, [[item jid] UTF8String]);
 			} else if ([[identity objectForKey:@"category"] isEqualToString:@"automation"] &&
 					   [[identity objectForKey:@"type"] isEqualToString:@"command-node"]) {
@@ -107,7 +107,7 @@
 				cmd.node = (char*)[[item node] UTF8String];
 				cmd.name = (char*)[[item name] UTF8String];
 				
-#warning This should not be called outside libpurple!
+				/* XXX Using 'extern' declared function from jabber prpl */
 				jabber_adhoc_execute(gc->proto_data, &cmd);
 			}
 		}
@@ -123,7 +123,7 @@
 	cmd.node = (char*)[[commandnode node] UTF8String];
 	cmd.name = (char*)[[commandnode name] UTF8String];
 	
-#warning This should not be called outside libpurple!
+	/* XXX Using 'extern' declared function from jabber prpl */
 	jabber_adhoc_execute(gc->proto_data, &cmd);
 }
 
diff -r 998a2971de8c -r 80bc77e30a4d Plugins/Purple Service/ESPurpleICQAccount.m
--- a/Plugins/Purple Service/ESPurpleICQAccount.m	Fri Nov 12 19:11:06 2010 -0600
+++ b/Plugins/Purple Service/ESPurpleICQAccount.m	Sat Nov 13 08:35:57 2010 -0600
@@ -27,6 +27,18 @@
     return "prpl-icq";
 }
 
+- (void)initAccount
+{
+	if ([[self preferenceForKey:KEY_CONNECT_HOST group:GROUP_ACCOUNT_STATUS] caseInsensitiveCompare:@"login.oscar.aol.com"] == NSOrderedSame) {
+		/* Reset to the default if we're set to the old AOL login server */
+		[self setPreference:nil
+					 forKey:KEY_CONNECT_HOST
+					  group:GROUP_ACCOUNT_STATUS];
+	}
+	
+	[super initAccount];
+}
+
 - (void)configurePurpleAccount
 {
 	[super configurePurpleAccount];
diff -r 998a2971de8c -r 80bc77e30a4d Plugins/Purple Service/PurpleDefaultsICQ.plist
--- a/Plugins/Purple Service/PurpleDefaultsICQ.plist	Fri Nov 12 19:11:06 2010 -0600
+++ b/Plugins/Purple Service/PurpleDefaultsICQ.plist	Sat Nov 13 08:35:57 2010 -0600
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>Connect Host</key>
-	<string>login.oscar.aol.com</string>
+	<string>login.icq.com</string>
 	<key>Connect Port</key>
 	<integer>5190</integer>
 	<key>ICQ:Encoding</key>