diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-05-25 01:04:18 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2006-05-25 01:04:18 +0200 |
| commit | 601e81362bbf4e4d1e686334b35d3bdcd87314d2 (patch) | |
| tree | 53ed2250bfc35b9e8da568b6f624a530d323ef32 /protocols/oscar/service.c | |
| parent | 46ad029950221205d1eb6201ec2f01c7231876c2 (diff) | |
| parent | fc630f9fb47690c30feaf4738727a213d633afc9 (diff) | |
[merge] Wilmer
Diffstat (limited to 'protocols/oscar/service.c')
| -rw-r--r-- | protocols/oscar/service.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/protocols/oscar/service.c b/protocols/oscar/service.c index 573e1983..4596974f 100644 --- a/protocols/oscar/service.c +++ b/protocols/oscar/service.c @@ -732,7 +732,7 @@ int aim_setextstatus(aim_session_t *sess, aim_conn_t *conn, guint32 status) guint32 data; int tlvlen; - data = AIM_ICQ_STATE_WEBAWARE | AIM_ICQ_STATE_HIDEIP | status; /* yay for error checking ;^) */ + data = AIM_ICQ_STATE_HIDEIP | status; /* yay for error checking ;^) */ tlvlen = aim_addtlvtochain32(&tl, 0x0006, data); @@ -880,13 +880,14 @@ int aim_sendmemblock(aim_session_t *sess, aim_conn_t *conn, guint32 offset, guin aimbs_put32(&fr->data, 0xa46d3b39); #endif +/* len can't be 0 here anyway... } else if ((offset == 0x00001000) && (len == 0x00000000)) { aimbs_put32(&fr->data, 0xd41d8cd9); aimbs_put32(&fr->data, 0x8f00b204); aimbs_put32(&fr->data, 0xe9800998); aimbs_put32(&fr->data, 0xecf8427e); - +*/ } else do_error_dialog(sess->aux_data, "WARNING: unknown hash request", "Gaim"); |