Mercurial > pidgin.yaz
changeset 12049:d854a6fc7b82
[gaim-migrate @ 14344]
Identify Gaim as "Gaim" instead of claiming to be the AIM or ICQ clients.
Justin Uberti said we should do this. Although, I can't seem to find
the blog entry where he mentioned it...
We'll see how it goes.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 12 Nov 2005 15:19:24 +0000 |
| parents | 6a95efdd1414 |
| children | 90d7e0f342fa |
| files | src/protocols/oscar/aim.h src/protocols/oscar/oscar.c |
| diffstat | 2 files changed, 14 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/oscar/aim.h Sat Nov 12 14:10:07 2005 +0000 +++ b/src/protocols/oscar/aim.h Sat Nov 12 15:19:24 2005 +0000 @@ -277,11 +277,20 @@ "us", "en", \ } +#define CLIENTINFO_GAIM { \ + "Gaim", \ + 0xf001, \ + GAIM_MAJOR_VERSION, GAIM_MINOR_VERSION, \ + GAIM_MINOR_VERSION, 0x0000, \ + 0x00000000, \ + "us", "en", \ +} + #define CLIENTINFO_AIM_KNOWNGOOD CLIENTINFO_AIM_5_1_3036 #define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQ_5_45_3777 -/* - * These could be arbitrary, but its easier to use the actual AIM values +/* + * These could be arbitrary, but its easier to use the actual AIM values */ #define AIM_CONN_TYPE_BOS 0x0002 #define AIM_CONN_TYPE_ADS 0x0005
--- a/src/protocols/oscar/oscar.c Sat Nov 12 14:10:07 2005 +0000 +++ b/src/protocols/oscar/oscar.c Sat Nov 12 15:19:24 2005 +0000 @@ -3061,11 +3061,8 @@ static int gaim_parse_login(aim_session_t *sess, aim_frame_t *fr, ...) { GaimConnection *gc = sess->aux_data; - OscarData *od = gc->proto_data; GaimAccount *account = gaim_connection_get_account(gc); -#if 0 - struct client_info_s info = {"gaim", 7, 3, 2003, "us", "en", 0x0004, 0x0000, 0x04b}; -#endif + struct client_info_s info = CLIENTINFO_GAIM; va_list ap; char *key; @@ -3073,15 +3070,8 @@ key = va_arg(ap, char *); va_end(ap); - if (od->icq) { - struct client_info_s info = CLIENTINFO_ICQ_KNOWNGOOD; - aim_send_login(sess, fr->conn, gaim_account_get_username(account), - gaim_connection_get_password(gc), &info, key); - } else { - struct client_info_s info = CLIENTINFO_AIM_KNOWNGOOD; - aim_send_login(sess, fr->conn, gaim_account_get_username(account), - gaim_connection_get_password(gc), &info, key); - } + aim_send_login(sess, fr->conn, gaim_account_get_username(account), + gaim_connection_get_password(gc), &info, key); gaim_connection_update_progress(gc, _("Password sent"), 2, OSCAR_CONNECT_STEPS); ck[2] = 0x6c;