pidgin/ljfisher-ssl-client-auth

merge of 'aae046c9b700d35f5a657402c455407828bc5727'

2011-06-20, Paul Aurich
c813fc085e6e
Parents aae046c9b700ecd778bdb3b4
Children 629533a3bd61c0dd78c7a49d
merge of 'aae046c9b700d35f5a657402c455407828bc5727'
and 'ecd778bdb3b468525b56ea7180c3e38b067687d0'
3 files changed, 27 insertions(+), 5 deletions(-)
  • +3 -0
    ChangeLog
  • +20 -3
    finch/finch.c
  • +4 -2
    pidgin/gtkmain.c
    • --- 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");