diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-06-03 22:20:43 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2006-06-03 22:20:43 +0200 |
| commit | 9779c186bd6d396a6fde61cc215f2438d453ee97 (patch) | |
| tree | f213d656883f0c9f602b9d78bfe3ee9143744bdf /protocols/oscar/service.c | |
| parent | a15c097fa32028394264cf66ef4fd31f56315eb3 (diff) | |
| parent | fb62f81f947c74e274b05e32d2e88e3a4d7e2613 (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"); |