diff options
author | Gary Kramlich <grim@reaperworld.com> | 2017-02-18 17:47:37 +0000 |
---|---|---|
committer | Gary Kramlich <grim@reaperworld.com> | 2017-02-18 17:47:37 +0000 |
commit | df31d3315d20b8e501af60d9b221548961bf8c23 (patch) | |
tree | b9cd04ee1932b70550d1d3331424e2a1714f2842 | |
parent | cd7a672f71dbe995e2f8a86eae90cc5621e9b0ac (diff) | |
parent | f746495284d98e90f462470049e2527acb92a009 (diff) | |
download | pidgin-df31d3315d20b8e501af60d9b221548961bf8c23.tar.gz |
Merged in Robbie/pidgin/release-2.x.y (pull request #160)
New DevID and DistID (2.x.y)
Approved-by: Gary Kramlich
Approved-by: Mike Ruprecht
Approved-by: dx
-rw-r--r-- | pidgin/gtkmain.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/pidgin/gtkmain.c b/pidgin/gtkmain.c index 3c4d1ad888..13aa1de9c6 100644 --- a/pidgin/gtkmain.c +++ b/pidgin/gtkmain.c @@ -377,24 +377,26 @@ static GHashTable *pidgin_ui_get_info(void) g_hash_table_insert(ui_info, "client_type", "pc"); /* - * 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 + * prpl-aim-clientkey is a DevID (or "client key") for Pidgin, given to + * us by AOL in September 2016. prpl-icq-clientkey is also a client key + * for Pidgin, owned by the AIM account "markdoliner." Please don't use + * either for other applications. Instead, 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). */ - g_hash_table_insert(ui_info, "prpl-aim-clientkey", "ma1cSASNCKFtrdv9"); + g_hash_table_insert(ui_info, "prpl-aim-clientkey", "do1UCeb5gNqxB1S1"); g_hash_table_insert(ui_info, "prpl-icq-clientkey", "ma1cSASNCKFtrdv9"); /* - * This is the distid for Pidgin, given to us by AOL. Please - * don't use this for other applications. You can just not - * specify a distid and libpurple will use a default. + * prpl-aim-distid is a distID for Pidgin, given to us by AOL in + * September 2016. prpl-icq-distid is also a distID for Pidgin, given + * to us by AOL. Please don't use either for other applications. + * Instead, you can just not specify a distID and libpurple will use a + * default. */ - g_hash_table_insert(ui_info, "prpl-aim-distid", GINT_TO_POINTER(1550)); + g_hash_table_insert(ui_info, "prpl-aim-distid", GINT_TO_POINTER(1715)); g_hash_table_insert(ui_info, "prpl-icq-distid", GINT_TO_POINTER(1550)); } |