pidgin/ljfisher-ssl-client-auth

applied changes from b3fee5c4d2368d304b653d33e4135469312fa5fb
release-2.9.0
2011-06-20, Mark Doliner
a3444a0a5fef
Parents ec1aeab6f886
Children 47337f5c45c2
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
2 files changed, 24 insertions(+), 5 deletions(-)
  • +20 -3
    finch/finch.c
  • +4 -2
    pidgin/gtkmain.c
    • --- 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");