pidgin.2.9.0: ed86fa6c: applied changes from 10a19d0da323fdc8c2b...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: ed86fa6cdb3a66adbcc097393383208091e948bc
Parent:   182f20213f2ab838f846247700441713769afcd7
Author:   markdoliner at pidgin.im
Date:     06/20/11 01:33:34
Branch:   im.pidgin.pidgin.2.9.0
URL: http://d.pidgin.im/viewmtn/revision/info/ed86fa6cdb3a66adbcc097393383208091e948bc

Changelog: 

applied changes from 10a19d0da323fdc8c2b315968e383219d8b9101f
             through fc575a35d01a235fedb83f75b6f8b2a60fe9d48b

Original commit message:
Change Finch to use Pidgin's clientkey/devid when connecting to ICQ.
For whatever reason the Finch-specific clientkey/devid stopped working.
Whatever.
Fixes #14294

Changes against parent 182f20213f2ab838f846247700441713769afcd7

  patched  finch/finch.c
  patched  pidgin/gtkmain.c

-------------- next part --------------
============================================================
--- pidgin/gtkmain.c	2ddda6f732ef7bde66e305cbbc7bad80da2a3484
+++ pidgin/gtkmain.c	a1f2225d089236b67598eec6d9e3f851ae52d772
@@ -381,8 +381,10 @@ static GHashTable *pidgin_ui_get_info(vo
 		 * 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");
============================================================
--- finch/finch.c	170d09042925f551e122f422b1e4f213952960fb
+++ finch/finch.c	0fd1f9049872ded606bb1b8c7457cf3606860464
@@ -74,13 +74,30 @@ static GHashTable *finch_ui_get_info(voi
 		 * 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
 		 * don't use this for other applications.  You can just not
 		 * specify a distid and libpurple will use a default.