Mercurial > pidgin
changeset 31693:5f3df5c14c0e
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
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 20 Jun 2011 05:33:34 +0000 |
| parents | 0f75ff04b8b6 |
| children | b0c3cbe5d3ec |
| files | finch/finch.c pidgin/gtkmain.c |
| diffstat | 2 files changed, 24 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/finch.c Mon Jun 20 05:33:07 2011 +0000 +++ b/finch/finch.c Mon Jun 20 05:33:34 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 05:33:07 2011 +0000 +++ b/pidgin/gtkmain.c Mon Jun 20 05:33:34 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");