# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1308549239 0
# Node ID 5166e76265aeb8f285542ebb0e5bb3bd54db11c5
# Parent  1d657ec53cdb11c14b95843d4c58fe4974ff326e# Parent  2d703748870f74bb015024538e41d52f70716566
merge of '3a12ece5b629e6de76faec79315514e70ccb32bb'
     and '4fdc7756ef147546eab68685a5d86c4b6db44a11'

diff -r 1d657ec53cdb -r 5166e76265ae ChangeLog
--- a/ChangeLog	Mon Jun 20 04:14:13 2011 +0000
+++ b/ChangeLog	Mon Jun 20 05:53:59 2011 +0000
@@ -4,6 +4,9 @@
 	Pidgin:
 	* Fix Conversation->Add on AIM and MSN.
 
+	Finch:
+	* Fixed logging in to ICQ.
+
 	libpurple:
 	* media: Actually use the specified TCP port from the TURN configuration to
 	  create a TCP relay candidate.
diff -r 1d657ec53cdb -r 5166e76265ae finch/finch.c
--- a/finch/finch.c	Mon Jun 20 04:14:13 2011 +0000
+++ b/finch/finch.c	Mon Jun 20 05:53:59 2011 +0000
@@ -74,11 +74,28 @@
 		 * account "markdoliner."  Please don't use this key for other
 		 * applications.  You can either not specify a client key, in
 		 * which case the default "libpurple" key will be used, or you
-		 * can register for your own client key at
-		 * http://developer.aim.com/manageKeys.jsp
+		 * can try to register your own at the AIM or ICQ web sites
+		 * (although this functionality was removed at some point, it's
+		 * possible it has been re-added).  AOL's old key management
+		 * page is http://developer.aim.com/manageKeys.jsp
 		 */
 		g_hash_table_insert(ui_info, "prpl-aim-clientkey", "ma19sqWV9ymU6UYc");
-		g_hash_table_insert(ui_info, "prpl-icq-clientkey", "ma19sqWV9ymU6UYc");
+
+		/*
+		 * This is the client key for "Pidgin."  It is owned by the AIM
+		 * account "markdoliner."  Please don't use this key for other
+		 * applications.  You can either not specify a client key, in
+		 * which case the default "libpurple" key will be used, or you
+		 * can try to register your own at the AIM or ICQ web sites
+		 * (although this functionality was removed at some point, it's
+		 * possible it has been re-added).  AOL's old key management
+		 * page is http://developer.aim.com/manageKeys.jsp
+		 *
+		 * We used to have a Finch-specific devId/clientkey
+		 * (ma19sqWV9ymU6UYc), but it stopped working, so we switched
+		 * to this one.
+		 */
+		g_hash_table_insert(ui_info, "prpl-icq-clientkey", "ma1cSASNCKFtrdv9");
 
 		/*
 		 * This is the distid for Finch, given to us by AOL.  Please
diff -r 1d657ec53cdb -r 5166e76265ae pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Mon Jun 20 04:14:13 2011 +0000
+++ b/pidgin/gtkmain.c	Mon Jun 20 05:53:59 2011 +0000
@@ -381,8 +381,10 @@
 		 * account "markdoliner."  Please don't use this key for other
 		 * applications.  You can either not specify a client key, in
 		 * which case the default "libpurple" key will be used, or you
-		 * can register for your own client key at
-		 * http://developer.aim.com/manageKeys.jsp
+		 * can try to register your own at the AIM or ICQ web sites
+		 * (although this functionality was removed at some point, it's
+		 * possible it has been re-added).  AOL's old key management
+		 * page is http://developer.aim.com/manageKeys.jsp
 		 */
 		g_hash_table_insert(ui_info, "prpl-aim-clientkey", "ma1cSASNCKFtrdv9");
 		g_hash_table_insert(ui_info, "prpl-icq-clientkey", "ma1cSASNCKFtrdv9");