diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2006-05-19 09:55:53 +0200 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2006-05-19 09:55:53 +0200 |
| commit | 41ca004ade77a9c343efbd523dd88deb9231487e (patch) | |
| tree | c096c4b6b34898e453dbdc9021262214234f66eb /protocols/oscar/service.c | |
| parent | ac83732afa83f21915e536c5c6f29f033f8623a3 (diff) | |
| parent | 881fd4e3a6d6405e982239e8b315069b724a1d22 (diff) | |
Merging from main development tree.
Diffstat (limited to 'protocols/oscar/service.c')
| -rw-r--r-- | protocols/oscar/service.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/protocols/oscar/service.c b/protocols/oscar/service.c index 4519ce14..4596974f 100644 --- a/protocols/oscar/service.c +++ b/protocols/oscar/service.c @@ -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"); |