diff options
| author | Mark Doliner <markdoliner@pidgin.im> | 2011-06-20 05:33:34 +0000 |
|---|---|---|
| committer | Mark Doliner <markdoliner@pidgin.im> | 2011-06-20 05:33:34 +0000 |
| commit | 1e766de17d55cd79bceb2d0b46702527520cd564 (patch) | |
| tree | 88b03be5f28cac916f3d97b554ce6978eba80992 | |
| parent | 715cb5a3ada5277f7b4ad0376ebffd0b54a65174 (diff) | |
| download | pidgin-1e766de17d55cd79bceb2d0b46702527520cd564.tar.gz | |
applied changes from b3fee5c4d2368d304b653d33e4135469312fa5fb
through fb4435d514398a0b1febebe8bf46339e2c2b52b6
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
| -rw-r--r-- | finch/finch.c | 23 | ||||
| -rw-r--r-- | pidgin/gtkmain.c | 6 |
2 files changed, 24 insertions, 5 deletions
diff --git a/finch/finch.c b/finch/finch.c index 98f94b529b..8ae3617569 100644 --- a/finch/finch.c +++ b/finch/finch.c @@ -74,11 +74,28 @@ static GHashTable *finch_ui_get_info(void) * 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 --git a/pidgin/gtkmain.c b/pidgin/gtkmain.c index 4a9b478080..24871a2c09 100644 --- a/pidgin/gtkmain.c +++ b/pidgin/gtkmain.c @@ -381,8 +381,10 @@ static GHashTable *pidgin_ui_get_info(void) * 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"); |