comparison: src/protocols/oscar/oscar.c
src/protocols/oscar/oscar.c
- changeset 10740
- a1cb6b819a21
- parent 10738
- 63ca8277c234
- child 10747
- aff9c0803189
equal
deleted
inserted
replaced
| 10739:9c7926312a4d | 10740:a1cb6b819a21 |
|---|---|
| 2564 | 2564 |
| 2565 static int gaim_parse_login(aim_session_t *sess, aim_frame_t *fr, ...) { | 2565 static int gaim_parse_login(aim_session_t *sess, aim_frame_t *fr, ...) { |
| 2566 GaimConnection *gc = sess->aux_data; | 2566 GaimConnection *gc = sess->aux_data; |
| 2567 OscarData *od = gc->proto_data; | 2567 OscarData *od = gc->proto_data; |
| 2568 GaimAccount *account = gaim_connection_get_account(gc); | 2568 GaimAccount *account = gaim_connection_get_account(gc); |
| 2569 GaimAccount *ac = gaim_connection_get_account(gc); | |
| 2570 #if 0 | 2569 #if 0 |
| 2571 struct client_info_s info = {"gaim", 7, 3, 2003, "us", "en", 0x0004, 0x0000, 0x04b}; | 2570 struct client_info_s info = {"gaim", 7, 3, 2003, "us", "en", 0x0004, 0x0000, 0x04b}; |
| 2572 #endif | 2571 #endif |
| 2573 va_list ap; | 2572 va_list ap; |
| 2574 char *key; | 2573 char *key; |
| 2577 key = va_arg(ap, char *); | 2576 key = va_arg(ap, char *); |
| 2578 va_end(ap); | 2577 va_end(ap); |
| 2579 | 2578 |
| 2580 if (od->icq) { | 2579 if (od->icq) { |
| 2581 struct client_info_s info = CLIENTINFO_ICQ_KNOWNGOOD; | 2580 struct client_info_s info = CLIENTINFO_ICQ_KNOWNGOOD; |
| 2582 aim_send_login(sess, fr->conn, gaim_account_get_username(ac), | 2581 aim_send_login(sess, fr->conn, gaim_account_get_username(account), |
| 2583 gaim_account_get_password(account), &info, key); | 2582 gaim_connection_get_password(gc), &info, key); |
| 2584 } else { | 2583 } else { |
| 2585 struct client_info_s info = CLIENTINFO_AIM_KNOWNGOOD; | 2584 struct client_info_s info = CLIENTINFO_AIM_KNOWNGOOD; |
| 2586 aim_send_login(sess, fr->conn, gaim_account_get_username(ac), | 2585 aim_send_login(sess, fr->conn, gaim_account_get_username(account), |
| 2587 gaim_account_get_password(account), &info, key); | 2586 gaim_connection_get_password(gc), &info, key); |
| 2588 } | 2587 } |
| 2589 | 2588 |
| 2590 gaim_connection_update_progress(gc, _("Password sent"), 2, OSCAR_CONNECT_STEPS); | 2589 gaim_connection_update_progress(gc, _("Password sent"), 2, OSCAR_CONNECT_STEPS); |
| 2591 ck[2] = 0x6c; | 2590 ck[2] = 0x6c; |
| 2592 | 2591 |
