Mercurial > pidgin
changeset 31676:5166e76265ae
merge of '3a12ece5b629e6de76faec79315514e70ccb32bb'
and '4fdc7756ef147546eab68685a5d86c4b6db44a11'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 20 Jun 2011 05:53:59 +0000 |
| parents | 1d657ec53cdb (current diff) 2d703748870f (diff) |
| children | 835ea8811734 5847a4c212f0 |
| files | |
| diffstat | 3 files changed, 27 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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
--- 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");